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/770aa411 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/770aa411 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/770aa411 Branch: refs/heads/CURATOR-3.0 Commit: 770aa411d00f97ce6040f2b4182d6f0fe744262d Parents: b58cfd0 144977f Author: randgalt <randg...@apache.org> Authored: Mon Jan 9 11:27:24 2017 -0500 Committer: randgalt <randg...@apache.org> Committed: Mon Jan 9 11:27:24 2017 -0500 ---------------------------------------------------------------------- .../apache/curator/framework/recipes/nodes/PersistentNode.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/770aa411/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java ---------------------------------------------------------------------- diff --cc curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java index 8375967,45f74ca..ecb5e57 --- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java +++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java @@@ -61,8 -59,7 +61,7 @@@ public class PersistentNode implements { private final AtomicReference<CountDownLatch> initialCreateLatch = new AtomicReference<CountDownLatch>(new CountDownLatch(1)); private final Logger log = LoggerFactory.getLogger(getClass()); - private final CuratorFramework client; + private final WatcherRemoveCuratorFramework client; - private final CreateModable<ACLBackgroundPathAndBytesable<String>> createMethod; private final AtomicReference<String> nodePath = new AtomicReference<String>(null); private final String basePath; private final CreateMode mode;