Separate internal redeploys from application package changes

Separate system internal redeploys from application package
changes such that we can ignore config updates originating
from application package changes if restart on deploy is true,
as the config change will be followed by a restart - but continue
to effect config changes originating from internal system changes
as those will not (and should not) be followed by a restart.

1 files changed, 3 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 d42afadfd9b..932d31c0036 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
@@ -200,11 +200,9 @@ public final class ConfiguredApplication implements Application {
                 try {
                     ContainerBuilder builder = createBuilderWithGuiceBindings();
 
-                    // Block until new config:
-                    boolean gotNewConfigToApply = configurer.getNewConfigGraph(builder.guiceModules().activate(),
-                                                                               qrConfig.restartOnDeploy());
-                    if (gotNewConfigToApply)
-                        intitializeAndActivateContainer(builder);
+                    // Block until new config arrives, and it should be applied
+                    configurer.getNewComponentGraph(builder.guiceModules().activate(), qrConfig.restartOnDeploy());
+                    intitializeAndActivateContainer(builder);
                 } catch (ConfigInterruptedException | InterruptedException e) {
                     break;
                 } catch (Exception | LinkageError e) { // LinkageError: OSGi problems