Repository: curator Updated Branches: refs/heads/CURATOR-3.0 ff169d6e8 -> 7e8a76ecf
CURATOR-337 - Fixed merge issue. Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/7e8a76ec Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7e8a76ec Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/7e8a76ec Branch: refs/heads/CURATOR-3.0 Commit: 7e8a76ecfc161421d0565710c976b3eae9f5f11c Parents: ff169d6 Author: Cam McKenzie <[email protected]> Authored: Thu Jul 28 13:24:33 2016 +1000 Committer: Cam McKenzie <[email protected]> Committed: Thu Jul 28 13:24:33 2016 +1000 ---------------------------------------------------------------------- .../java/org/apache/curator/framework/recipes/cache/TreeCache.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/7e8a76ec/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java ---------------------------------------------------------------------- diff --git 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 index 95b173e..ed32223 100644 --- 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 @@ -504,7 +504,7 @@ public class TreeCache implements Closeable private final AtomicBoolean isInitialized = new AtomicBoolean(false); private final TreeNode root; - private final CuratorFramework client; + private final WatcherRemoveCuratorFramework client; private final ExecutorService executorService; private final boolean cacheData; private final boolean dataIsCompressed;
