Merge pull request #19962 from vespa-engine/revert-19960-revert-19957-hmusum/always-set-new-config-when-updated-generation-take-2v7.499.15

Always set new config when updated generation, take 3

1 files changed, 11 insertions, 0 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
index dbe13e90c9c..354489ea946 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
@@ -49,6 +49,17 @@ public class GenericJRTConfigSubscription extends JRTConfigSubscription<RawConfi
         }
     }
 
+    // Need to override this method, since we use RawConfig in this class,
+    @Override
+    protected void setNewConfigAndGeneration(JRTClientConfigRequest jrtReq) {
+        // Set generation first, as RawConfig contains generation and that
+        // will make configChanged in ConfigState always true otherwise
+        // (see equals usage in setConfigAndGeneration())
+        setGeneration(jrtReq.getNewGeneration());
+        RawConfig rawConfig = RawConfig.createFromResponseParameters(jrtReq);
+        setConfigAndGeneration(jrtReq.getNewGeneration(), jrtReq.responseIsApplyOnRestart(), rawConfig, jrtReq.getNewChecksums());
+    }
+
     // Override to propagate internal redeploy into the config value in addition to the config state
     @Override
     void setApplyOnRestart(boolean applyOnRestart) {