summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2021-07-02 14:23:47 +0200
committerGitHub <noreply@github.com>2021-07-02 14:23:47 +0200
commit84d58897f1217c3535bae4cb4d275ca1f63b0b94 (patch)
treef955d3c8f84fff6fe8361f996b45eb15f954ef29 /container-core
parent6dd83495194282067271567415fd86fbeaa29eb8 (diff)
Revert "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.java7
1 files changed, 2 insertions, 5 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 08a468a3031..9f6f5cf7ea1 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,11 +117,8 @@ public class HandlersConfigurerDi {
@Override
public void installPlatformBundles(Collection<String> 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));
- }
+ log.fine("Installing platform bundles.");
+ platformBundleLoader.useBundles(new ArrayList<>(bundlePaths));
}
@Override