summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java7
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