fixed some merge issues
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/69b5a658 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/69b5a658 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/69b5a658 Branch: refs/heads/CURATOR-215 Commit: 69b5a65814ebc7f736206819b4640f8124a4142a Parents: 7497fc9 Author: randgalt <[email protected]> Authored: Tue May 12 17:14:48 2015 -0500 Committer: randgalt <[email protected]> Committed: Tue May 12 17:14:48 2015 -0500 ---------------------------------------------------------------------- .../org/apache/curator/framework/imps/CreateBuilderImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/69b5a658/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java index 091ee91..6eef4d4 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java @@ -626,6 +626,7 @@ class CreateBuilderImpl implements CreateBuilder, BackgroundOperation<PathAndByt boolean localFirstTime = firstTime.getAndSet(false) && !debugForceFindProtectedNode; if ( !localFirstTime && doProtected ) { + debugForceFindProtectedNode = false; String createdPath = null; try { @@ -640,7 +641,7 @@ class CreateBuilderImpl implements CreateBuilder, BackgroundOperation<PathAndByt { try { - sendBackgroundResponse(KeeperException.Code.OK.intValue(), createdPath, backgrounding.getContext(), ZKPaths.getNodeFromPath(createdPath), this); + sendBackgroundResponse(KeeperException.Code.OK.intValue(), createdPath, backgrounding.getContext(), createdPath, this); } catch ( Exception e ) { @@ -679,7 +680,7 @@ class CreateBuilderImpl implements CreateBuilder, BackgroundOperation<PathAndByt @Override public String call() throws Exception { - boolean localFirstTime = firstTime.getAndSet(false); + boolean localFirstTime = firstTime.getAndSet(false) && !debugForceFindProtectedNode; String createdPath = null; if ( !localFirstTime && doProtected )
