diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-12-19 15:54:00 +0100 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:30 +0100 |
commit | b743451d1ff4d3cc2846fccc819c1fa82156db97 (patch) | |
tree | d7f0d232d21acfeda972632a024c65e61c5ddc14 /container-disc/src | |
parent | 7169d752f5444e7d94ea6ec0bdeae65cdc693427 (diff) |
Revert "Bratseth/search container deprecations"
Diffstat (limited to 'container-disc/src')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 4 |
1 files changed, 4 insertions, 0 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 eae121604e4..1cb4e1d4555 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 @@ -39,6 +39,7 @@ import com.yahoo.jrt.slobrok.api.SlobrokList; import com.yahoo.log.LogLevel; import com.yahoo.log.LogSetup; import com.yahoo.net.HostName; +import com.yahoo.osgi.OsgiImpl; import com.yahoo.vespa.config.ConfigKey; import com.yahoo.yolean.Exceptions; @@ -114,6 +115,7 @@ public final class ConfiguredApplication implements Application { } + @SuppressWarnings("deprecation") // TODO: Remove when the Container line below is removed @Inject public ConfiguredApplication(ContainerActivator activator, OsgiFramework osgiFramework, @@ -125,6 +127,7 @@ public final class ConfiguredApplication implements Application { this.subscriberFactory = subscriberFactory; this.configId = System.getProperty("config.id"); this.restrictedOsgiFramework = new DisableOsgiFramework(new RestrictedBundleContext(osgiFramework.bundleContext())); + Container.get().setOsgi(new OsgiImpl(osgiFramework)); // TODO: Remove, not necessary applicationWithLegacySetup = new ContainerDiscApplication(configId); } @@ -189,6 +192,7 @@ public final class ConfiguredApplication implements Application { try { Container.get().setupFileAcquirer(config.filedistributor()); Container.get().setupUrlDownloader(); + 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); |