Merge branch 'master' into CURATOR-267
Conflicts:
curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/722d0cee
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/722d0cee
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/722d0cee
Branch: refs/heads/master
Commit: 722d0cee3c0ad1ef65f25a80f5363bfcfd9e3792
Parents: 275b1d5 a14b277
Author: randgalt <[email protected]>
Authored: Fri Oct 16 13:39:51 2015 -0500
Committer: randgalt <[email protected]>
Committed: Fri Oct 16 13:39:51 2015 -0500
----------------------------------------------------------------------
.../curator/framework/imps/NamespaceFacade.java | 6 --
.../curator/framework/imps/SyncBuilderImpl.java | 2 +-
.../curator/framework/imps/TestFramework.java | 42 ++++++++
.../recipes/nodes/PersistentEphemeralNode.java | 101 +++++++++----------
.../nodes/TestPersistentEphemeralNode.java | 82 +++++++++++++++
5 files changed, 172 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/722d0cee/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
----------------------------------------------------------------------
diff --cc
curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
index ff9cb12,a3298ab..684e0d9
---
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
+++
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
@@@ -352,12 -355,8 +355,13 @@@ public class PersistentEphemeralNode im
}
}
- private byte[] getData()
+ /**
+ * Return the current value of our data
+ *
+ * @return our data
+ */
- public byte[] getData() {
++ public byte[] getData()
+ {
return this.data.get();
}
