curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dragonsi...@apache.org
Subject curator git commit: Merge branch 'master' into CURATOR-3.0
Date Mon, 01 Feb 2016 19:36:55 GMT
Repository: curator
Updated Branches:
  refs/heads/3.0-help [created] 6acf09871


Merge branch 'master' 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/6acf0987
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/6acf0987
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/6acf0987

Branch: refs/heads/3.0-help
Commit: 6acf0987125469ecb79ff48ce5e9735a98cd1abb
Parents: c6a22ba d124a0a
Author: Scott Blum <dragonsinth@apache.org>
Authored: Mon Feb 1 14:24:35 2016 -0500
Committer: Scott Blum <dragonsinth@apache.org>
Committed: Mon Feb 1 14:24:35 2016 -0500

----------------------------------------------------------------------
 .../framework/recipes/cache/ChildData.java      | 22 +++++-------
 .../recipes/cache/PathChildrenCache.java        |  5 ++-
 .../framework/recipes/cache/TreeCache.java      | 38 ++++++++++----------
 3 files changed, 32 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/6acf0987/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/6acf0987/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 a2f0e86,3f7d8d4..0ee1832
--- 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
@@@ -303,10 -295,8 +302,8 @@@ public class TreeCache implements Close
  
          void wasDeleted() throws Exception
          {
-             Stat oldStat = stat.getAndSet(null);
-             byte[] oldData = data.getAndSet(null);
+             ChildData oldChildData = childData.getAndSet(null);
 -            client.clearWatcherReferences(this);
 +            client.watches().remove(this).ofType(WatcherType.Any).locally().inBackground().forPath(path);
- 
              ConcurrentMap<String, TreeNode> childMap = children.getAndSet(null);
              if ( childMap != null )
              {


Mime
View raw message