curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject curator git commit: fixed bad merge
Date Mon, 11 Jan 2016 04:24:50 GMT
Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 100dd3f26 -> 24aa3c38a


fixed bad merge


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/24aa3c38
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/24aa3c38
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/24aa3c38

Branch: refs/heads/CURATOR-3.0
Commit: 24aa3c38ac4e78015f6a594c6d3604d3d9c30532
Parents: 100dd3f
Author: randgalt <randgalt@apache.org>
Authored: Sun Jan 10 23:24:43 2016 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Sun Jan 10 23:24:43 2016 -0500

----------------------------------------------------------------------
 .../framework/imps/FindAndDeleteProtectedNodeInBackground.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/24aa3c38/curator-framework/src/main/java/org/apache/curator/framework/imps/FindAndDeleteProtectedNodeInBackground.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/FindAndDeleteProtectedNodeInBackground.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/FindAndDeleteProtectedNodeInBackground.java
index 7b5073b..3882a0e 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/FindAndDeleteProtectedNodeInBackground.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/FindAndDeleteProtectedNodeInBackground.java
@@ -97,7 +97,7 @@ class FindAndDeleteProtectedNodeInBackground implements BackgroundOperation<Void
 
                 if ( rc != KeeperException.Code.OK.intValue() )
                 {
-                    CuratorEventImpl event = new CuratorEventImpl(client, CuratorEventType.CHILDREN,
rc, path, null, o, stat, null, strings, null, null);
+                    CuratorEventImpl event = new CuratorEventImpl(client, CuratorEventType.CHILDREN,
rc, path, null, o, stat, null, strings, null, null, null);
                     client.processBackgroundOperation(operationAndData, event);
                 }
             }


Mime
View raw message