1 files changed, 6 insertions, 4 deletions
diff --git a/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala b/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala
index dc94d789f7b..0d829b0456d 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala
@@ -29,25 +29,27 @@ final class ConfigRetriever(bootstrapKeys: Set[ConfigKeyT],
 
 
   @tailrec
-  final def getConfigs(componentConfigKeys: Set[ConfigKeyT], leastGeneration: Long): ConfigSnapshot = {
+  final def getConfigs(componentConfigKeys: Set[ConfigKeyT], leastGeneration: Long, restartOnRedeploy: Boolean = false): ConfigSnapshot = {
     require(componentConfigKeys intersect bootstrapKeys isEmpty)
     log.log(DEBUG, "getConfigs: " + componentConfigKeys)
 
     setupComponentSubscriber(componentConfigKeys ++ bootstrapKeys)
 
-    getConfigsOptional(leastGeneration) match {
+    getConfigsOptional(leastGeneration, restartOnRedeploy) match {
       case Some(snapshot) => resetComponentSubscriberIfBootstrap(snapshot); snapshot
-      case None => getConfigs(componentConfigKeys, leastGeneration)
+      case None => getConfigs(componentConfigKeys, leastGeneration, restartOnRedeploy)
     }
   }
 
-  private def getConfigsOptional(leastGeneration: Long): Option[ConfigSnapshot] = {
+  private def getConfigsOptional(leastGeneration: Long, restartOnRedeploy: Boolean): Option[ConfigSnapshot] = {
     val newestComponentGeneration = componentSubscriber.waitNextGeneration()
     log.log(DEBUG, s"getConfigsOptional: new component generation: $newestComponentGeneration")
 
     // leastGeneration is only used to ensure newer generation when the previous generation was invalidated due to an exception
     if (newestComponentGeneration < leastGeneration) {
       None
+    } else if (restartOnRedeploy && ! componentSubscriber.internalRedeploy()) { // Don't reconfig - wait for restart
+      None
     } else if (bootstrapSubscriber.generation < newestComponentGeneration) {
       val newestBootstrapGeneration = bootstrapSubscriber.waitNextGeneration()
       log.log(DEBUG, s"getConfigsOptional: new bootstrap generation: ${bootstrapSubscriber.generation}")