Simplify

1 files changed, 3 insertions, 4 deletions

diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
index be0ec535740..8303db7f12c 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
+++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
@@ -109,10 +109,9 @@ public class Reconfigurer extends AbstractComponent {
                             ". Joining servers: " + joiningServers + ", leaving servers: " + leavingServers);
         sleeper.accept(reconfigWaitPeriod());
         String connectionSpec = connectionSpec(activeConfig);
-        boolean reconfigured = false;
         Instant end = Instant.now().plus(reconfigTimeout);
         // Loop reconfiguring since we might need to wait until another reconfiguration is finished before we can succeed
-        for (int attempts = 1; ! reconfigured && Instant.now().isBefore(end); attempts++) {
+        for (int attempts = 1; Instant.now().isBefore(end); attempts++) {
             try {
                 Instant reconfigStarted = Instant.now();
                 zooKeeperReconfigure(connectionSpec, joiningServers, leavingServers);
@@ -121,7 +120,8 @@ public class Reconfigurer extends AbstractComponent {
                                     Duration.between(reconfigTriggered, reconfigEnded) +
                                     ", after " + attempts + " attempt(s). ZooKeeper reconfig call took " +
                                     Duration.between(reconfigStarted, reconfigEnded));
-                reconfigured = true;
+                activeConfig = newConfig;
+                return;
             } catch (KeeperException e) {
                 if (!retryOn(e))
                     throw new RuntimeException(e);
@@ -130,7 +130,6 @@ public class Reconfigurer extends AbstractComponent {
                 sleeper.accept(retryWait);
             }
         }
-        activeConfig = newConfig;
     }
 
     /** Returns how long this node should wait before reconfiguring the cluster */