aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-08-28 16:14:01 +0200
committerGitHub <noreply@github.com>2020-08-28 16:14:01 +0200
commit61e3586ef1f5050038f1bcb72a9a1f4ee6ba44c8 (patch)
tree06b6d0f3a55e7a79ea75b3a8d589f65a6a47344d
parent5f13cd33ac9015e0bd17f9c2c8080e8183480b92 (diff)
parent01f8f6e448869439f242760feddf0110504a2f7f (diff)
Merge pull request #14194 from vespa-engine/gjoranv/remove-extra-osgi
Do not create an extra OsgiImpl instance.
-rw-r--r--container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index 13d50b9b30f..25299978ecd 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -107,9 +107,8 @@ public class HandlersConfigurerDi {
super(osgiFramework);
this.osgiFramework = osgiFramework;
- OsgiImpl osgi = new OsgiImpl(osgiFramework);
- applicationBundleLoader = new ApplicationBundleLoader(osgi, new FileAcquirerBundleInstaller(fileAcquirer));
- platformBundleLoader = new PlatformBundleLoader(osgi);
+ applicationBundleLoader = new ApplicationBundleLoader(this, new FileAcquirerBundleInstaller(fileAcquirer));
+ platformBundleLoader = new PlatformBundleLoader(this);
}