aboutsummaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-04-05 13:02:57 +0200
committergjoranv <gv@oath.com>2018-04-05 13:02:57 +0200
commit9598e0d066982652e739ad0e0367973befa83f6c (patch)
treef6065f03fcef5a8ee24ef403d50ea986752bf14c /container-disc
parenta8047424b0e2ca6bde8b4c156bd5a6c69eb153c1 (diff)
Jump out of reconfig loop if qrConfig.restartOnDeploy is true.
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java1
1 files changed, 1 insertions, 0 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 d8a1a26f850..10510ff5679 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
@@ -201,6 +201,7 @@ public final class ConfiguredApplication implements Application {
ContainerBuilder builder = createBuilderWithGuiceBindings();
configurer.runOnceAndEnsureRegistryHackRun(builder.guiceModules().activate());
intitializeAndActivateContainer(builder);
+ if (qrConfig.restartOnDeploy()) break;
} catch (ConfigInterruptedException | InterruptedException e) {
break;
} catch (Exception | LinkageError e) { // LinkageError: OSGi problems