From 2bf7338892dbe3894c49d93ab1d2f0b2d90ce68c Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Fri, 4 Feb 2022 14:37:22 +0100
Subject: Initialize port watcher thread in constructor

---
 .../main/java/com/yahoo/container/jdisc/ConfiguredApplication.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'container-disc/src/main/java')

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 018984bbc35..64e94bd5f03 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
@@ -95,8 +95,8 @@ public final class ConfiguredApplication implements Application {
     private final OsgiFramework restrictedOsgiFramework;
     private final Phaser nonTerminatedContainerTracker = new Phaser(1);
     private final Thread reconfigurerThread;
+    private final Thread portWatcher;
     private HandlersConfigurerDi configurer;
-    private Thread portWatcher;
     private QrConfig qrConfig;
 
     private Register slobrokRegistrator = null;
@@ -137,6 +137,7 @@ public final class ConfiguredApplication implements Application {
         this.restrictedOsgiFramework = new DisableOsgiFramework(new RestrictedBundleContext(osgiFramework.bundleContext()));
         this.shutdownDeadline = new ShutdownDeadline(configId);
         this.reconfigurerThread = new Thread(this::doReconfigurationLoop, "configured-application-reconfigurer");
+        this.portWatcher = new Thread(this::watchPortChange, "configured-application-port-watcher");
     }
 
     @Override
@@ -150,7 +151,7 @@ public final class ConfiguredApplication implements Application {
         initializeAndActivateContainer(builder, () -> {});
         reconfigurerThread.setDaemon(true);
         reconfigurerThread.start();
-        portWatcher = new Thread(this::watchPortChange, "configured-application-port-watcher");
+
         portWatcher.setDaemon(true);
         portWatcher.start();
         if (setupRpc()) {
-- 
cgit v1.2.3