diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-07-01 22:56:19 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2021-07-01 22:57:41 +0200 |
| commit | eebc10e47aebfabbb1c0e21b164fe9380755319a (patch) | |
| tree | 522443de160fba7e1aa3e1e3afd4142dfe93a005 /container-core | |
| parent | 8aed741469c87c9676b8687967dbdf5cba0125cf (diff) | |
Don't install physical bundles for test osgi frameworks.
Diffstat (limited to 'container-core')
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java | 7 |
1 files changed, 5 insertions, 2 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 9f6f5cf7ea1..08a468a3031 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 @@ -117,8 +117,11 @@ public class HandlersConfigurerDi { @Override public void installPlatformBundles(Collection<String> bundlePaths) { - log.fine("Installing platform bundles."); - platformBundleLoader.useBundles(new ArrayList<>(bundlePaths)); + // Don't install physical bundles for test frameworks, where all platform bundles are on the classpath. + if (osgiFramework.isFelixFramework()) { + log.fine("Installing platform bundles."); + platformBundleLoader.useBundles(new ArrayList<>(bundlePaths)); + } } @Override |