Merge branch 'CURATOR-72'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/0a82f4ea Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/0a82f4ea Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/0a82f4ea Branch: refs/heads/master Commit: 0a82f4eaa518ae41097fefdce332099dd2983286 Parents: 09f04e9 777a5f1 Author: randgalt <randg...@apache.org> Authored: Wed Feb 5 13:41:33 2014 -0500 Committer: randgalt <randg...@apache.org> Committed: Wed Feb 5 13:41:33 2014 -0500 ---------------------------------------------------------------------- .../org/apache/curator/ConnectionState.java | 9 ++ .../apache/curator/CuratorZookeeperClient.java | 11 ++ .../java/org/apache/curator/HandleHolder.java | 2 +- .../curator/framework/imps/Backgrounding.java | 5 + .../framework/imps/CuratorFrameworkImpl.java | 145 +++++++++++++------ .../framework/state/ConnectionStateManager.java | 47 +++++- .../framework/client/TestBackgroundStates.java | 142 ++++++++++++++++++ ...estResetConnectionWithBackgroundFailure.java | 104 +++++++++++++ .../TestPersistentEphemeralNodeListener.java | 94 ++++++++++++ 9 files changed, 510 insertions(+), 49 deletions(-) ----------------------------------------------------------------------