Repository: curator
Updated Branches:
  refs/heads/persistent-watch 79e37de1b -> 9979fa2d4


fixed merge issue


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

Branch: refs/heads/persistent-watch
Commit: 9979fa2d435aa0fb82b6bd16205e04305c40e7b1
Parents: 79e37de
Author: randgalt <[email protected]>
Authored: Mon Jul 31 09:38:15 2017 -0500
Committer: randgalt <[email protected]>
Committed: Mon Jul 31 09:38:15 2017 -0500

----------------------------------------------------------------------
 .../apache/curator/framework/recipes/watch/TestTreeCache.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/9979fa2d/curator-recipes/src/test/java/org/apache/curator/framework/recipes/watch/TestTreeCache.java
----------------------------------------------------------------------
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/watch/TestTreeCache.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/watch/TestTreeCache.java
index e82538d..2f30fd4 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/watch/TestTreeCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/watch/TestTreeCache.java
@@ -18,7 +18,7 @@
  */
 package org.apache.curator.framework.recipes.watch;
 
-import org.apache.curator.test.KillServerSession;
+import org.apache.curator.test.KillSession;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.zookeeper.CreateMode;
 import org.testng.Assert;
@@ -401,7 +401,7 @@ public class TestTreeCache extends BaseTestTreeCache
         client.create().withMode(CreateMode.EPHEMERAL).forPath("/test/me", 
"data".getBytes());
         assertEvent(CacheEvent.NODE_CREATED, "/test/me");
 
-        KillServerSession.kill(client.getZookeeperClient().getZooKeeper(), 
server.getConnectString());
+        KillSession.kill(client.getZookeeperClient().getZooKeeper());
         assertEvent(CacheEvent.NODE_DELETED, "/test/me", "data".getBytes());
         assertEvent(CacheEvent.CACHE_REFRESHED);
 

Reply via email to