aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2021-11-10 13:57:29 +0100
committerHarald Musum <musum@yahooinc.com>2021-11-10 13:57:29 +0100
commit2c6698cdbf94516c4909e2e2093d89d6fab24dcc (patch)
tree87216ed5ce759a786c642337104ad9fe9ba38b1d /config
parent9f498a8cbcd85e639f799787a582f9124df0ad63 (diff)
Always update config when generation has changed
Diffstat (limited to 'config')
-rw-r--r--config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java6
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 27099790f5b..2094a0509ec 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,11 +70,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
// ConfigSubscriber clears it
if (jrtReq.hasUpdatedGeneration()) {
setApplyOnRestart(jrtReq.responseIsApplyOnRestart());
- if (jrtReq.hasUpdatedConfig()) {
- setNewConfig(jrtReq);
- } else {
- setGeneration(jrtReq.getNewGeneration());
- }
+ setNewConfig(jrtReq);
}
return newConfigOrException();