diff options
author | gjoranv <gv@verizonmedia.com> | 2020-07-17 14:23:41 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-07-17 14:23:41 +0200 |
commit | 5627a766d1d34159ee126b4980dc817654bc7508 (patch) | |
tree | a1f5ff3d39f0343fc22e3109c5fb331b21ebdaad /container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java | |
parent | f1d49e5d8be88d61c832569ca0871dc240f2ebe2 (diff) |
Reapply "Load platform bundles separately 3"
This reverts commit 1c69b4e72b3212e3ce989a8675db08ac51b7f79d.
Diffstat (limited to 'container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java')
-rw-r--r-- | container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java index ed93d15c975..b34442d50a9 100644 --- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java +++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java @@ -16,6 +16,7 @@ import java.util.logging.Logger; /** * @author Tony Vaagenes * @author bratseth + * @author gjoranv */ public class OsgiImpl implements Osgi { private static final Logger log = Logger.getLogger(OsgiImpl.class.getName()); @@ -42,11 +43,6 @@ public class OsgiImpl implements Osgi { } @Override - public List<Bundle> getInitialBundles() { - return initialBundles; - } - - @Override public Bundle[] getBundles() { List<Bundle> bundles = jdiscOsgi.bundles(); return bundles.toArray(new Bundle[bundles.size()]); @@ -155,6 +151,11 @@ public class OsgiImpl implements Osgi { jdiscOsgi.allowDuplicateBundles(bundles); } + @Override + public boolean hasFelixFramework() { + return jdiscOsgi.isFelixFramework(); + } + private static Bundle firstNonFrameworkBundle(List<Bundle> bundles) { for (Bundle b : bundles) { if (! (b instanceof Framework)) |