You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ca...@apache.org on 2016/07/28 00:51:52 UTC
[3/3] curator git commit: Merge branch 'master' into CURATOR-3.0
Merge branch 'master' into CURATOR-3.0
Conflicts:
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/ff169d6e
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ff169d6e
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ff169d6e
Branch: refs/heads/CURATOR-3.0
Commit: ff169d6e8da4740c254fb18a742f90ab012c3b4b
Parents: 25ddaeb 6cebfc1
Author: Cam McKenzie <ca...@apache.org>
Authored: Thu Jul 28 10:51:07 2016 +1000
Committer: Cam McKenzie <ca...@apache.org>
Committed: Thu Jul 28 10:51:07 2016 +1000
----------------------------------------------------------------------
.../framework/recipes/cache/TreeCache.java | 34 ++++++--------------
.../recipes/leader/LeaderSelector.java | 21 ++++++------
2 files changed, 21 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/ff169d6e/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
----------------------------------------------------------------------
diff --cc curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
index a69a810,906d23d..95b173e
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
@@@ -609,10 -586,9 +593,10 @@@ public class TreeCache implements Close
{
if ( treeState.compareAndSet(TreeState.STARTED, TreeState.CLOSED) )
{
+ client.removeWatchers();
client.getConnectionStateListenable().removeListener(connectionStateListener);
listeners.clear();
- executorService.close();
+ executorService.shutdown();
try
{
root.wasDeleted();