diff options
author | gjoranv <gv@verizonmedia.com> | 2021-10-15 12:30:02 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2021-10-15 12:30:02 +0200 |
commit | b5ec5c62a86cf10693f5043d3580ae8e16ebf90a (patch) | |
tree | d385659f7159afb9a883b02d24028ea1617625b9 /config/src | |
parent | 55c541b27c1c18d019ffb2a608734d89609c9861 (diff) |
Reapply "Throw instead of setting config if we get bad config [run-systemtest]"
This reverts commit cacd694f88f673a0d6e753c52993df8e46721922.
Diffstat (limited to 'config/src')
-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 123366d4695..27099790f5b 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 @@ -102,16 +102,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); } } |