Reapply "Load platform bundles separately"

This reverts commit 0355cb740fe498abc03861bcb64de5e418c2fa88.

1 files changed, 7 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..998273acfc7 100644
--- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java
+++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java
@@ -5,6 +5,7 @@ import com.yahoo.component.ComponentSpecification;
 import com.yahoo.component.Version;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.jdisc.application.OsgiFramework;
+import com.yahoo.jdisc.core.FelixFramework;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.launch.Framework;
@@ -16,6 +17,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 +44,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 +152,11 @@ public class OsgiImpl implements Osgi {
         jdiscOsgi.allowDuplicateBundles(bundles);
     }
 
+    @Override
+    public boolean hasFelixFramework() {
+        return jdiscOsgi instanceof FelixFramework;
+    }
+
     private static Bundle firstNonFrameworkBundle(List<Bundle> bundles) {
         for (Bundle b : bundles) {
             if (! (b instanceof Framework))