1 files changed, 1 insertions, 24 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java
index e20fbd7b2ae..5236daf0302 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java
@@ -58,7 +58,7 @@ public class ApplicationBundleLoader {
         removeInactiveFileReferences(obsoleteReferences);
 
         installBundles(newFileReferences);
-        startBundles();
+        BundleStarter.startBundles(reference2Bundle.values());
         log.info(installedBundlesMessage());
 
         return bundlesToUninstall;
@@ -120,29 +120,6 @@ public class ApplicationBundleLoader {
         }
     }
 
-    /**
-     * Resolves and starts (calls the Bundles BundleActivator) all bundles. Bundle resolution must take place
-     * after all bundles are installed to ensure that the framework can resolve dependencies between bundles.
-     */
-    private void startBundles() {
-        for (var bundle : reference2Bundle.values()) {
-            try {
-                if ( ! isFragment(bundle))
-                    bundle.start();  // NOP for already ACTIVE bundles
-            } catch(Exception e) {
-                throw new RuntimeException("Could not start bundle '" + bundle.getSymbolicName() + "'", e);
-            }
-        }
-    }
-
-    private boolean isFragment(Bundle bundle) {
-        BundleRevision bundleRevision = bundle.adapt(BundleRevision.class);
-        if (bundleRevision == null)
-            throw new NullPointerException("Null bundle revision means that bundle has probably been uninstalled: " +
-                                           bundle.getSymbolicName() + ":" + bundle.getVersion());
-        return (bundleRevision.getTypes() & BundleRevision.TYPE_FRAGMENT) != 0;
-    }
-
     private String installedBundlesMessage() {
         StringBuilder sb = new StringBuilder("Installed bundles: {" );
         for (Bundle b : osgi.getBundles())