diff options
author | HÃ¥kon Hallingstad <hakon@oath.com> | 2018-12-01 00:47:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-01 00:47:29 +0100 |
commit | 8e4eeb40e46f7b2fde27ac82bf14f27be4de6ecb (patch) | |
tree | b7237df951072a75d3d527b757f11e6b08214c3d /container-disc | |
parent | c0513ac34d2c438e9f97e699659855029e1f06e8 (diff) |
Revert "Remove zombie code"
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 6 |
1 files changed, 3 insertions, 3 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 27defe08fa8..69a525a2c54 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,6 +11,7 @@ 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; @@ -133,11 +134,10 @@ public final class ConfiguredApplication implements Application { portWatcher.start(); } - @SuppressWarnings("deprecation") + private static void hackToInitializeServer(QrConfig config) { try { - Container.get().setupFileAcquirer(config.filedistributor()); - com.yahoo.container.Server.get().initialize(config); + Server.get().initialize(config); } catch (Exception e) { log.log(LogLevel.ERROR, "Caught exception when initializing server. Exiting.", e); Runtime.getRuntime().halt(1); |