From 83108df45e6f9c635771a2cad7fd7cd296b9f799 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Sat, 1 Dec 2018 08:21:55 -0800 Subject: Revert "Merge pull request #7831 from vespa-engine/revert-7818-bratseth/remove-unused-rpc-server" This reverts commit 0aeda846a4dd36c03f49e4504e91ee2c813bde87, reversing changes made to c0513ac34d2c438e9f97e699659855029e1f06e8. --- .../main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'container-disc') 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 69a525a2c54..27defe08fa8 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 @@ -11,7 +11,6 @@ import com.yahoo.config.ConfigInstance; import com.yahoo.config.subscription.ConfigInterruptedException; import com.yahoo.container.Container; import com.yahoo.container.QrConfig; -import com.yahoo.container.Server; import com.yahoo.container.core.ChainsConfig; import com.yahoo.container.core.config.HandlersConfigurerDi; import com.yahoo.container.di.config.Subscriber; @@ -134,10 +133,11 @@ public final class ConfiguredApplication implements Application { portWatcher.start(); } - + @SuppressWarnings("deprecation") private static void hackToInitializeServer(QrConfig config) { try { - Server.get().initialize(config); + Container.get().setupFileAcquirer(config.filedistributor()); + com.yahoo.container.Server.get().initialize(config); } catch (Exception e) { log.log(LogLevel.ERROR, "Caught exception when initializing server. Exiting.", e); Runtime.getRuntime().halt(1); -- cgit v1.2.3