Close clients in unit test

1 files changed, 9 insertions, 8 deletions

diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java b/zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java
index 922c389f94a..db643d76e0d 100644
--- a/zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java
+++ b/zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java
@@ -124,18 +124,19 @@ public class VespaZooKeeperTest {
     }
 
     static String writeData(ZookeeperServerConfig config) throws IOException, InterruptedException, KeeperException {
-        ZooKeeperAdmin admin = createAdmin(config);
-        List<ACL> acl = ZooDefs.Ids.OPEN_ACL_UNSAFE;
-        String node = admin.create("/test-node", "hi".getBytes(UTF_8), acl, CreateMode.EPHEMERAL_SEQUENTIAL);
-        String read = new String(admin.getData(node, false, new Stat()), UTF_8);
-        assertEquals("hi", read);
-        return node;
+        try (ZooKeeperAdmin admin = createAdmin(config)) {
+            List<ACL> acl = ZooDefs.Ids.OPEN_ACL_UNSAFE;
+            String node = admin.create("/test-node", "hi".getBytes(UTF_8), acl, CreateMode.EPHEMERAL_SEQUENTIAL);
+            String read = new String(admin.getData(node, false, new Stat()), UTF_8);
+            assertEquals("hi", read);
+            return node;
+        }
     }
 
     static void verifyData(String path, ZookeeperServerConfig config) throws IOException, InterruptedException, KeeperException {
         for (int i = 0; i < 10; i++) {
-            try {
-                assertEquals("hi", new String(createAdmin(config).getData(path, false, new Stat()), UTF_8));
+            try (ZooKeeperAdmin admin = createAdmin(config)) {
+                assertEquals("hi", new String(admin.getData(path, false, new Stat()), UTF_8));
                 return;
             }
             catch (KeeperException.ConnectionLossException e) {