X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2FRuntimeManagerMain.java;h=f4ed507c07b37229cd73b8ccbd376deadcef8f22;hb=641e3f3c535f540afd122d2a7b53389342f77002;hp=74560185d011729928c5e5d9476a6e086ea4b0ff;hpb=7d4cccc2f758f30e0704f2e8f500c43fd4245ebf;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.init/src/org/argeo/init/RuntimeManagerMain.java b/org.argeo.init/src/org/argeo/init/RuntimeManagerMain.java
index 74560185d..f4ed507c0 100644
--- a/org.argeo.init/src/org/argeo/init/RuntimeManagerMain.java
+++ b/org.argeo.init/src/org/argeo/init/RuntimeManagerMain.java
@@ -17,11 +17,10 @@ import org.argeo.api.init.InitConstants;
 import org.argeo.api.init.RuntimeContext;
 import org.argeo.api.init.RuntimeManager;
 import org.argeo.init.logging.ThinLoggerFinder;
+import org.argeo.init.osgi.OsgiBoot;
 import org.argeo.init.osgi.OsgiRuntimeContext;
 import org.argeo.internal.init.InternalState;
-import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
 import org.osgi.framework.FrameworkEvent;
 import org.osgi.framework.launch.Framework;
 
@@ -69,16 +68,12 @@ public class RuntimeManagerMain implements RuntimeManager {
 
 			BundleContext bc = managerRuntimeContext.getFramework().getBundleContext();
 			// uninstall init as a bundle since it will be available via OSGi system
-			for (Bundle b : bc.getBundles()) {
-				if (b.getSymbolicName().equals(SYMBOLIC_NAME_INIT)) {
-					b.uninstall();
-				}
-			}
+			OsgiBoot.uninstallBundles(bc, SYMBOLIC_NAME_INIT);
 			bc.registerService(RuntimeManager.class, this, new Hashtable<>(configuration));
 			logger.log(Level.DEBUG, "Registered runtime manager");
 
 			managerRuntimeContext.waitForStop(0);
-		} catch (InterruptedException | BundleException e) {
+		} catch (InterruptedException e) {
 			e.printStackTrace();
 			System.exit(1);
 		}