summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-12-19 15:50:30 +0100
committergjoranv <gv@oath.com>2019-01-21 15:09:30 +0100
commit7169d752f5444e7d94ea6ec0bdeae65cdc693427 (patch)
tree9c755982943fd8cbe5a20ae1f6c88cfbb27abeda /container-disc
parenta1558f05f710f4cbcbfa9fae6ad419884b1dd57b (diff)
Remove deprecated methods
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java3
1 files changed, 0 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 57b8e61a339..eae121604e4 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,7 +39,6 @@ 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;
@@ -115,7 +114,6 @@ public final class ConfiguredApplication implements Application {
}
- @SuppressWarnings("deprecation") // TODO: Remove when the Container line below is removed
@Inject
public ConfiguredApplication(ContainerActivator activator,
OsgiFramework osgiFramework,
@@ -127,7 +125,6 @@ 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);
}