curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cammcken...@apache.org
Subject curator git commit: MED-217 - Fixing up merge issues.
Date Tue, 18 Aug 2015 23:13:27 GMT
Repository: curator
Updated Branches:
  refs/heads/217-merged d5d12c88b -> 7d972593a


MED-217 - Fixing up merge issues.


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

Branch: refs/heads/217-merged
Commit: 7d972593a53f260c78d18bff9d8929b5dea94fe4
Parents: d5d12c8
Author: Cam McKenzie <cammckenzie@apache.org>
Authored: Wed Aug 19 09:12:47 2015 +1000
Committer: Cam McKenzie <cammckenzie@apache.org>
Committed: Wed Aug 19 09:12:47 2015 +1000

----------------------------------------------------------------------
 .../curator/framework/imps/RemoveWatchesBuilderImpl.java       | 2 +-
 .../apache/curator/framework/imps/WatcherRemovalFacade.java    | 6 ++++++
 .../framework/recipes/locks/TestInterProcessMutexBase.java     | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/7d972593/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
index d872ced..f2666e6 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
@@ -296,7 +296,7 @@ public class RemoveWatchesBuilderImpl implements RemoveWatchesBuilder,
RemoveWat
             public void processResult(int rc, String path, Object ctx)
             {
                 trace.commit();
-                CuratorEvent event = new CuratorEventImpl(client, CuratorEventType.REMOVE_WATCHES,
rc, path, null, ctx, null, null, null, null, null);
+                CuratorEvent event = new CuratorEventImpl(client, CuratorEventType.REMOVE_WATCHES,
rc, path, null, ctx, null, null, null, null, null, null);
                 client.processBackgroundOperation(operationAndData, event);             
  
             }
         };

http://git-wip-us.apache.org/repos/asf/curator/blob/7d972593/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalFacade.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalFacade.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalFacade.java
index 156341e..47c2104 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalFacade.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalFacade.java
@@ -161,6 +161,12 @@ class WatcherRemovalFacade extends CuratorFrameworkImpl implements WatcherRemove
     {
         return client.fixForNamespace(path);
     }
+    
+    @Override
+    String fixForNamespace(String path, boolean isSequential)
+    {
+    	return client.fixForNamespace(path, isSequential);
+    }
 
     @Override
     public EnsurePath newNamespaceAwareEnsurePath(String path)

http://git-wip-us.apache.org/repos/asf/curator/blob/7d972593/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
index f44d238..9eb4144 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
@@ -28,6 +28,7 @@ import org.apache.curator.framework.state.ConnectionStateListener;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 import org.apache.curator.test.BaseClassForTests;
 import org.apache.curator.test.KillSession;
+import org.apache.curator.test.TestingServer;
 import org.apache.curator.test.Timing;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.curator.utils.ZKPaths;


Mime
View raw message