Revert "Merge pull request #15495 from vespa-engine/revert-15494-bratseth/apply-on-restart-take-2"

This reverts commit ef4ece0ae64a1f1ec8accb257168b2a08d6971b1, reversing
changes made to 204eb6f5faf91a6159ba5c7e01d2d8b6f307e8bd.

1 files changed, 12 insertions, 2 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 eec18b93e71..ba8fc8a5e19 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
@@ -18,7 +18,6 @@ import static java.util.logging.Level.FINE;
  * Used by config proxy.
  *
  * @author Vegard Havdal
- *
  */
 public class GenericJRTConfigSubscription extends JRTConfigSubscription<RawConfig> {
 
@@ -33,7 +32,7 @@ public class GenericJRTConfigSubscription extends JRTConfigSubscription<RawConfi
 
     @Override
     protected void setNewConfig(JRTClientConfigRequest jrtReq) {
-        setConfig(jrtReq.getNewGeneration(), jrtReq.responseIsInternalRedeploy(), RawConfig.createFromResponseParameters(jrtReq) );
+        setConfig(jrtReq.getNewGeneration(), jrtReq.responseIsInternalRedeploy(), jrtReq.responseIsApplyOnRestart(), RawConfig.createFromResponseParameters(jrtReq) );
         log.log(FINE, () -> "in setNewConfig, config=" + this.getConfigState().getConfig());
     }
 
@@ -60,6 +59,17 @@ public class GenericJRTConfigSubscription extends JRTConfigSubscription<RawConfi
         }
     }
 
+    // Override to propagate internal redeploy into the config value in addition to the config state
+    @Override
+    void setApplyOnRestart(boolean applyOnRestart) {
+        super.setApplyOnRestart(applyOnRestart);
+        ConfigState<RawConfig> configState = getConfigState();
+
+        if (configState.getConfig() != null) {
+            configState.getConfig().setApplyOnRestart(applyOnRestart);
+        }
+    }
+
     public RawConfig getRawConfig() {
         return getConfigState().getConfig();
     }