You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/07/11 13:58:35 UTC

curator git commit: Merge branch 'patch-1' of github.com:nivs/curator into CURATOR-420

Repository: curator
Updated Branches:
  refs/heads/CURATOR-2.0 6af5f367e -> fc4b905f6


Merge branch 'patch-1' of github.com:nivs/curator into CURATOR-420


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/fc4b905f
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/fc4b905f
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/fc4b905f

Branch: refs/heads/CURATOR-2.0
Commit: fc4b905f6e98074812f3bed891c3e79d0b7503c3
Parents: 6af5f36
Author: randgalt <ra...@apache.org>
Authored: Tue Jul 11 08:56:51 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Tue Jul 11 08:58:12 2017 -0500

----------------------------------------------------------------------
 .../apache/curator/framework/recipes/shared/SharedCount.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/fc4b905f/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedCount.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedCount.java b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedCount.java
index bdfa844..6375bdf 100644
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedCount.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedCount.java
@@ -146,7 +146,10 @@ public class SharedCount implements Closeable, SharedCountReader, Listenable<Sha
     @Override
     public void     removeListener(SharedCountListener listener)
     {
-        listeners.remove(listener);
+        SharedValueListener valueListener = listeners.remove(listener);
+        if(valueListener != null) {
+            sharedValue.getListenable().removeListener(valueListener);
+        }
     }
 
     /**