Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CEC4C18443 for ; Fri, 16 Oct 2015 18:40:07 +0000 (UTC) Received: (qmail 12600 invoked by uid 500); 16 Oct 2015 18:40:07 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 12540 invoked by uid 500); 16 Oct 2015 18:40:07 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 12453 invoked by uid 99); 16 Oct 2015 18:40:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Oct 2015 18:40:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 672D2E0440; Fri, 16 Oct 2015 18:40:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randgalt@apache.org To: commits@curator.apache.org Date: Fri, 16 Oct 2015 18:40:10 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] curator git commit: Merge branch 'master' into CURATOR-267 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 Authored: Fri Oct 16 13:39:51 2015 -0500 Committer: randgalt 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(); }