Merge pull request #19283 from vespa-engine/hmusum/fail-instead-of-setting-config-if-we-get-bad-config-in-response

Throw instead of setting config if we get bad config [run-systemtest]

1 files changed, 3 insertions, 8 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
index e83fc7aefc5..f50ed694115 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
@@ -105,16 +105,11 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
     }
 
     protected void setNewConfig(JRTClientConfigRequest jrtReq) {
-        Exception badConfigE = null;
-        T configInstance = null;
         try {
-            configInstance = toConfigInstance(jrtReq);
+            T configInstance = toConfigInstance(jrtReq);
+            setConfig(jrtReq.getNewGeneration(), jrtReq.responseIsApplyOnRestart(), configInstance, jrtReq.getNewChecksums());
         } catch (IllegalArgumentException e) {
-            badConfigE = e;
-        }
-        setConfig(jrtReq.getNewGeneration(), jrtReq.responseIsApplyOnRestart(), configInstance, jrtReq.getNewChecksums());
-        if (badConfigE != null) {
-            throw new IllegalArgumentException("Bad config from jrt", badConfigE);
+            throw new IllegalArgumentException("Bad config in response", e);
         }
     }