Merge branch 'CURATOR-247' into CURATOR-3.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d57aaeb7 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d57aaeb7 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d57aaeb7 Branch: refs/heads/CURATOR-248 Commit: d57aaeb77b40fd6a4f5aa52e3d4e44dbe02c1700 Parents: 667c97e c641c02 Author: randgalt <randg...@apache.org> Authored: Tue Sep 1 06:02:08 2015 -0700 Committer: randgalt <randg...@apache.org> Committed: Tue Sep 1 06:02:08 2015 -0700 ---------------------------------------------------------------------- .../org/apache/curator/ConnectionState.java | 108 +++++++---- .../apache/curator/CuratorZookeeperClient.java | 112 +++++++++--- .../java/org/apache/curator/HandleHolder.java | 19 ++ .../main/java/org/apache/curator/RetryLoop.java | 18 +- .../ClassicConnectionHandlingPolicy.java | 68 +++++++ .../connection/ConnectionHandlingPolicy.java | 72 ++++++++ .../StandardConnectionHandlingPolicy.java | 56 ++++++ .../org/apache/curator/utils/DebugUtils.java | 11 +- .../java/org/apache/curator/TestEnsurePath.java | 3 + .../framework/CuratorFrameworkFactory.java | 58 ++++++ .../framework/api/UnhandledErrorListener.java | 4 +- .../imps/ClassicInternalConnectionHandler.java | 58 ++++++ .../framework/imps/CuratorFrameworkImpl.java | 86 ++++----- .../imps/InternalConnectionHandler.java | 10 ++ .../imps/StandardInternalConnectionHandler.java | 22 +++ .../framework/state/ConnectionState.java | 27 ++- .../framework/state/ConnectionStateManager.java | 91 +++++++--- .../framework/imps/TestBlockUntilConnected.java | 1 + .../imps/TestEnabledSessionExpiredState.java | 179 +++++++++++++++++++ .../framework/imps/TestFrameworkEdges.java | 2 - ...estResetConnectionWithBackgroundFailure.java | 19 +- .../recipes/leader/TestLeaderSelectorEdges.java | 6 +- .../locks/TestInterProcessMutexBase.java | 19 +- .../apache/curator/test/BaseClassForTests.java | 37 +++- .../java/org/apache/curator/test/Timing.java | 35 +++- .../discovery/details/TestServiceDiscovery.java | 2 + src/site/confluence/errors.confluence | 6 +- 27 files changed, 945 insertions(+), 184 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/d57aaeb7/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java ----------------------------------------------------------------------
