diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-01 09:28:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-01 09:28:42 +0200 |
commit | b8341539baf9c5ccc933e161afbe9facd7eb87ca (patch) | |
tree | 27b8d95de07971e41bf66ce1c205c9a62578c108 /config/src/main/java/com | |
parent | e8f032cc4133fae1b9002a07709d0dd112ed4c73 (diff) | |
parent | dfae4a69d17977243d4b04b866162431fdd9d6cb (diff) |
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]
Diffstat (limited to 'config/src/main/java/com')
-rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java | 11 |
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); } } |