Revert "Merge pull request #15690 from vespa-engine/revert-15686-bratseth/simplify-config"

This reverts commit a90709008ec0d108ee9a2e26bda20e39a10424b5, reversing
changes made to fcb2b4a2fd7a594520613c48d58e26963c68ea90.

1 files changed, 1 insertions, 5 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index 3158c06b0b1..f32d7dfbb02 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -261,16 +261,12 @@ public final class ConfiguredApplication implements Application {
 
     private void startReconfigurerThread() {
         reconfigurerThread = new Thread(() -> {
-            boolean restartOnDeploy = false;
             while ( ! Thread.interrupted()) {
                 try {
                     ContainerBuilder builder = createBuilderWithGuiceBindings();
 
-                    // Restart on deploy is sticky: Once it is set no future generation should be applied until restart
-                    restartOnDeploy = restartOnDeploy || qrConfig.restartOnDeploy();
-
                     // Block until new config arrives, and it should be applied
-                    configurer.getNewComponentGraph(builder.guiceModules().activate(), restartOnDeploy);
+                    configurer.getNewComponentGraph(builder.guiceModules().activate());
                     initializeAndActivateContainer(builder);
                 } catch (ConfigInterruptedException e) {
                     break;