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

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

1 files changed, 8 insertions, 3 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 f50ed694115..e83fc7aefc5 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,11 +105,16 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
     }
 
     protected void setNewConfig(JRTClientConfigRequest jrtReq) {
+        Exception badConfigE = null;
+        T configInstance = null;
         try {
-            T configInstance = toConfigInstance(jrtReq);
-            setConfig(jrtReq.getNewGeneration(), jrtReq.responseIsApplyOnRestart(), configInstance, jrtReq.getNewChecksums());
+            configInstance = toConfigInstance(jrtReq);
         } catch (IllegalArgumentException e) {
-            throw new IllegalArgumentException("Bad config in response", e);
+            badConfigE = e;
+        }
+        setConfig(jrtReq.getNewGeneration(), jrtReq.responseIsApplyOnRestart(), configInstance, jrtReq.getNewChecksums());
+        if (badConfigE != null) {
+            throw new IllegalArgumentException("Bad config from jrt", badConfigE);
         }
     }