diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-07-02 12:48:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-02 12:48:04 +0200 |
| commit | 12aa238ae9caa794a864013ec8db84097f0df668 (patch) | |
| tree | 53e4d7d0ee54eba483329284a10d71228efe0f9f /container-core | |
| parent | 130e036704c2e46717cffc56a0af3ddcbef932ac (diff) | |
| parent | 05a50f410f2ff2891b6d5ce458cd53fb7b95bc7d (diff) | |
Merge pull request #18488 from vespa-engine/install-model-evalutation-via-configmodel
Install model evaluation via configmodel [run-systemtest]
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 |