diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-02-06 13:51:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-06 13:51:18 +0100 |
commit | 7dce081acda97a835fd6310bcbe0206e04791857 (patch) | |
tree | 117a958a5d6b2e5a0472e6190143b6c16a2ed1b3 /config | |
parent | 443768b659684622310708e4e110d381e5a9b3ff (diff) | |
parent | 05e48ae30e5231c8c23f2e3a7e1775242aca485c (diff) |
Merge pull request #12087 from vespa-engine/hmusum/always-set-new-config-when-generation-updated
Always set new config (which also sets generation) when generation ha…
Diffstat (limited to 'config')
-rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java | 6 |
1 files changed, 1 insertions, 5 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 8327f1c1351..9c40d0605bd 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 @@ -92,11 +92,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc } if (jrtReq.hasUpdatedGeneration()) { setInternalRedeploy(jrtReq.responseIsInternalRedeploy()); - if (jrtReq.hasUpdatedConfig()) { - setNewConfig(jrtReq); - } else { - setGeneration(jrtReq.getNewGeneration()); - } + setNewConfig(jrtReq); } return true; } |