summaryrefslogtreecommitdiffstats
path: root/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-07-17 10:06:33 +0200
committerGitHub <noreply@github.com>2020-07-17 10:06:33 +0200
commitbe3f7b4d605f598ab22885394f3d7472439cd1a9 (patch)
treea90d1e84a48e83baade1bd101145c808bb5d6c8d /jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
parentbc2c2241cfb7980ec122050f693de68052ad8b2d (diff)
parent60bf570feffd5921c41f028696ce4d9b000b780c (diff)
Merge pull request #13909 from vespa-engine/load-platform-bundles-separately_3
Load platform bundles separately 3
Diffstat (limited to 'jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
index c14e513fb98..bd189f8b898 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
@@ -169,6 +169,11 @@ public class FelixFramework implements OsgiFramework {
collisionHook.allowDuplicateBundles(bundles);
}
+ @Override
+ public boolean isFelixFramework() {
+ return true;
+ }
+
private void installBundle(String bundleLocation, Set<String> mask, List<Bundle> out) throws BundleException {
bundleLocation = BundleLocationResolver.resolve(bundleLocation);
if (mask.contains(bundleLocation)) {