diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-07-09 13:52:30 +0200 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2021-07-09 13:52:30 +0200 |
| commit | 273e9572331ae4360d3f0e4e7089dfc86392983d (patch) | |
| tree | 3b0b1b46a4e793ac10c3ca0613f21c33ac175df7 /container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java | |
| parent | 95a7a658c876c62de0f04226f80f5ce5003e77a4 (diff) | |
| parent | 6422dedc3926d604e071c087e0e8263f4c8f9390 (diff) | |
Merge branch 'master' into musum/cleanup-ConfigCurator-1
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java')
| -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 |