diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-11-10 14:48:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-10 14:48:02 +0100 |
commit | 9628bf02a362bec0d543af71c8223a0a4211e7fc (patch) | |
tree | 6e46e684ab6720d09f4417200e85a07a83c3103e /config | |
parent | 6393fbb164ee9bee75159fc8b1a625452e87265a (diff) |
Revert "Always update config when generation has changed [run-systemtest]"
Diffstat (limited to 'config')
-rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java | 6 |
1 files changed, 5 insertions, 1 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 2094a0509ec..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 @@ -70,7 +70,11 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc // ConfigSubscriber clears it if (jrtReq.hasUpdatedGeneration()) { setApplyOnRestart(jrtReq.responseIsApplyOnRestart()); - setNewConfig(jrtReq); + if (jrtReq.hasUpdatedConfig()) { + setNewConfig(jrtReq); + } else { + setGeneration(jrtReq.getNewGeneration()); + } } return newConfigOrException(); |