Merge pull request #19954 from vespa-engine/revert-19951-hmusum/always-set-new-config-when-updated-generation

Revert "Always update config when generation has changed [run-systemtest]"

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();