Catch exception

1 files changed, 8 insertions, 10 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java
index e79497e0dd3..f7e295c48bd 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java
@@ -5,15 +5,14 @@ import com.yahoo.config.subscription.ConfigSourceSet;
 import com.yahoo.config.subscription.impl.GenericConfigHandle;
 import com.yahoo.config.subscription.impl.GenericConfigSubscriber;
 import com.yahoo.config.subscription.impl.JRTConfigRequester;
-
-import java.util.Optional;
-import java.util.logging.Level;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.RawConfig;
 import com.yahoo.vespa.config.TimingValues;
 import com.yahoo.yolean.Exceptions;
 
 import java.util.Map;
+import java.util.Optional;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -43,14 +42,13 @@ public class Subscriber {
     }
 
     public Optional<RawConfig> nextGeneration() {
-        if (subscriber.nextGeneration(0, true)) { // Proxy should never skip config due to not initializing
-            try {
+        try {
+            if (subscriber.nextGeneration(0, true))// Proxy should never skip config due to not initializing
                 return Optional.of(handle.getRawConfig());
-            } catch (Exception e) {  // To avoid thread throwing exception and loop never running this again
-                log.log(Level.WARNING, "Got exception: " + Exceptions.toMessageString(e));
-            } catch (Throwable e) {
-                com.yahoo.protect.Process.logAndDie("Got error, exiting: " + Exceptions.toMessageString(e));
-            }
+        } catch (Exception e) {  // To avoid thread throwing exception and loop never running this again
+            log.log(Level.WARNING, "Got exception: " + Exceptions.toMessageString(e));
+        } catch (Throwable e) {
+            com.yahoo.protect.Process.logAndDie("Got error, exiting: " + Exceptions.toMessageString(e));
         }
         return Optional.empty();
     }