Move supervisor back to FileDistributionFactory, there should be only one

2 files changed, 7 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java
index bb63b9947af..2cfa240666a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java
@@ -5,6 +5,8 @@ import com.google.inject.Inject;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.application.api.FileRegistry;
 import com.yahoo.config.model.api.FileDistribution;
+import com.yahoo.jrt.Supervisor;
+import com.yahoo.jrt.Transport;
 import com.yahoo.vespa.defaults.Defaults;
 
 import java.io.File;
@@ -18,6 +20,7 @@ import java.io.File;
 public class FileDistributionFactory {
 
     protected final ConfigserverConfig configserverConfig;
+    private final Supervisor supervisor = new Supervisor(new Transport("filedistribution"));
 
     @Inject
     public FileDistributionFactory(ConfigserverConfig configserverConfig) {
@@ -29,7 +32,7 @@ public class FileDistributionFactory {
     }
 
     public FileDistribution createFileDistribution() {
-        return new FileDistributionImpl(getFileReferencesDir());
+        return new FileDistributionImpl(getFileReferencesDir(), supervisor);
     }
 
     public AddFileInterface createFileManager(File applicationDir) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java
index 98fe5856adb..f0afab20177 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java
@@ -9,7 +9,6 @@ import com.yahoo.jrt.Spec;
 import com.yahoo.jrt.StringArray;
 import com.yahoo.jrt.Supervisor;
 import com.yahoo.jrt.Target;
-import com.yahoo.jrt.Transport;
 
 import java.io.File;
 import java.util.Set;
@@ -24,11 +23,12 @@ public class FileDistributionImpl implements FileDistribution, RequestWaiter {
     private final static Logger log = Logger.getLogger(FileDistributionImpl.class.getName());
     private final static double rpcTimeout = 1.0;
 
-    private final Supervisor supervisor = new Supervisor(new Transport("filedistribution"));
+    private final Supervisor supervisor;
     private final File fileReferencesDir;
 
-    public FileDistributionImpl(File fileReferencesDir) {
+    public FileDistributionImpl(File fileReferencesDir, Supervisor supervisor) {
         this.fileReferencesDir = fileReferencesDir;
+        this.supervisor = supervisor;
     }
 
     @Override