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…

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;
     }