From 9628bf02a362bec0d543af71c8223a0a4211e7fc Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Wed, 10 Nov 2021 14:48:02 +0100
Subject: Revert "Always update config when generation has changed
 [run-systemtest]"

---
 .../com/yahoo/config/subscription/impl/JRTConfigSubscription.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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();
-- 
cgit v1.2.3