From dfae4a69d17977243d4b04b866162431fdd9d6cb Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Fri, 24 Sep 2021 13:07:06 +0200
Subject: Throw instead of setting config if we get bad config

---
 .../yahoo/config/subscription/impl/JRTConfigSubscription.java | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'config')

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);
         }
     }
 
-- 
cgit v1.2.3