diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2020-07-17 12:54:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 12:54:42 +0200 |
| commit | 92e5e970a5c62c3e8865af0e14423205972e80d1 (patch) | |
| tree | 4bf429e6f04d83def3cd20a1fb1e2f373ca633fe /jdisc_core/src/main/java/com/yahoo | |
| parent | f26c185567882621485b0aac7ef311fff8d52be9 (diff) | |
| parent | 1c69b4e72b3212e3ce989a8675db08ac51b7f79d (diff) | |
Merge pull request #13916 from vespa-engine/revert-13909-load-platform-bundles-separately_3
Revert "Load platform bundles separately 3"
Diffstat (limited to 'jdisc_core/src/main/java/com/yahoo')
| -rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java | 7 | ||||
| -rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java | 5 |
2 files changed, 0 insertions, 12 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java index 12168663205..b1aceb81bc6 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java @@ -113,11 +113,4 @@ public interface OsgiFramework { */ void stop() throws BundleException; - /** - * Returns true if this is a Felix based framework and not e.g. a test framework. - */ - default boolean isFelixFramework() { - return false; - } - } 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 bd189f8b898..c14e513fb98 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,11 +169,6 @@ 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)) { |