Simplify, no functional changes

2 files changed, 12 insertions, 25 deletions

diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java b/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java
index c002ffa72ce..ae4a70e4677 100644
--- a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java
+++ b/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java
@@ -18,21 +18,21 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 public class ReconfigurableVespaZooKeeperServer extends AbstractComponent implements VespaZooKeeperServer {
 
-    private final AtomicReference<QuorumPeer> peer = new AtomicReference<>();
+    private final QuorumPeer peer;
 
     @Inject
     public ReconfigurableVespaZooKeeperServer(Reconfigurer reconfigurer, ZookeeperServerConfig zookeeperServerConfig) {
-        reconfigurer.startOrReconfigure(zookeeperServerConfig, this, VespaQuorumPeer::new, peer::set);
+        peer = reconfigurer.startOrReconfigure(zookeeperServerConfig, this, VespaQuorumPeer::new);
     }
 
     @Override
     public void shutdown() {
-        peer.get().shutdown(Duration.ofMinutes(1));
+        peer.shutdown(Duration.ofMinutes(1));
     }
 
     @Override
     public void start(Path configFilePath) {
-        peer.get().start(configFilePath);
+        peer.start(configFilePath);
     }
 
     @Override
diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java b/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
index 27aa18c64c7..acd5cd07a28 100644
--- a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
+++ b/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
@@ -20,26 +20,19 @@ public class VespaZooKeeperAdminImpl implements VespaZooKeeperAdmin {
 
     @Override
     public void reconfigure(String connectionSpec, String joiningServers, String leavingServers) throws ReconfigException {
-        ZooKeeperAdmin zooKeeperAdmin = null;
-        try {
-            zooKeeperAdmin = createAdmin(connectionSpec);
+        try (ZooKeeperAdmin zooKeeperAdmin = createAdmin(connectionSpec)) {
             long fromConfig = -1;
             // Using string parameters because the List variant of reconfigure fails to join empty lists (observed on 3.5.6, fixed in 3.7.0)
             byte[] appliedConfig = zooKeeperAdmin.reconfigure(joiningServers, leavingServers, null, fromConfig, null);
             log.log(Level.INFO, "Applied ZooKeeper config: " + new String(appliedConfig, StandardCharsets.UTF_8));
-        } catch (KeeperException e) {
-            if (retryOn(e))
-                throw new ReconfigException(e);
-            else
-                throw new RuntimeException(e);
-        } catch (IOException | InterruptedException e) {
+        }
+        catch (   KeeperException.ReconfigInProgress
+                | KeeperException.ConnectionLossException
+                | KeeperException.NewConfigNoQuorum  e) {
+            throw new ReconfigException(e);
+        }
+        catch (KeeperException | IOException | InterruptedException e) {
             throw new RuntimeException(e);
-        } finally {
-            if (zooKeeperAdmin != null) {
-                try {
-                    zooKeeperAdmin.close();
-                } catch (InterruptedException e) { /* ignore */}
-            }
         }
     }
 
@@ -48,11 +41,5 @@ public class VespaZooKeeperAdminImpl implements VespaZooKeeperAdmin {
                                   (event) -> log.log(Level.INFO, event.toString()), new ZkClientConfigBuilder().toConfig());
     }
 
-    private static boolean retryOn(KeeperException e) {
-        return e instanceof KeeperException.ReconfigInProgress ||
-               e instanceof KeeperException.ConnectionLossException ||
-               e instanceof KeeperException.NewConfigNoQuorum;
-    }
-
 }