Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8E8C618E12 for ; Tue, 1 Sep 2015 13:28:10 +0000 (UTC) Received: (qmail 32538 invoked by uid 500); 1 Sep 2015 13:27:54 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 32469 invoked by uid 500); 1 Sep 2015 13:27:54 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 31362 invoked by uid 99); 1 Sep 2015 13:27:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2015 13:27:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2933BDFF8C; Tue, 1 Sep 2015 13:27:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randgalt@apache.org To: commits@curator.apache.org Date: Tue, 01 Sep 2015 13:28:36 -0000 Message-Id: <37123bafe9b049a68ad4e091c3277f20@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [44/45] curator git commit: Merge branch 'CURATOR-247' into CURATOR-3.0 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 Authored: Tue Sep 1 06:02:08 2015 -0700 Committer: randgalt 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 ----------------------------------------------------------------------