Propagate internalRedeploy to the RawConfig instance

2 files changed, 13 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 e8c7edd3943..c1f9ce02650 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
@@ -50,6 +50,17 @@ public class GenericJRTConfigSubscription extends JRTConfigSubscription<RawConfi
         }
     }
 
+    // Override to propagate internal redeploy into the config value in addition to the config state
+    @Override
+    void setInternalRedeploy(boolean internalRedeploy) {
+        super.setInternalRedeploy(internalRedeploy);
+        ConfigState<RawConfig> configState = getConfigState();
+
+        if (configState.getConfig() != null) {
+            configState.getConfig().setInternalRedeploy(internalRedeploy);
+        }
+    }
+
     public RawConfig getRawConfig() {
         return getConfigState().getConfig();
     }
diff --git a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java
index ae4431e5195..8ff69b56ffe 100755
--- a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java
+++ b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java
@@ -116,6 +116,8 @@ public class RawConfig extends ConfigInstance {
 
     public void setGeneration(long generation) { this.generation = generation; }
 
+    public void setInternalRedeploy(boolean internalRedeploy) { this.internalRedeploy = internalRedeploy; }
+
     /**
      * Returns whether this config generation was created by a system internal redeploy, not an
      * application package change.