From 9598e0d066982652e739ad0e0367973befa83f6c Mon Sep 17 00:00:00 2001
From: gjoranv <gv@oath.com>
Date: Thu, 5 Apr 2018 13:02:57 +0200
Subject: Jump out of reconfig loop if qrConfig.restartOnDeploy is true.

---
 .../src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java   | 1 +
 1 file changed, 1 insertion(+)

(limited to 'container-disc/src')

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
-- 
cgit v1.2.3