X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.osgiboot%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgiboot%2FActivator.java;fp=runtime%2Forg.argeo.slc.osgiboot%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgiboot%2FActivator.java;h=6d5a6ed02ee3d4317384a98d9f7c772477f57b92;hb=56f9a29fc3d208bb1a0e9476b9d67dc372098e70;hp=78d6024f93798f26309b740d8f2cbf81c6a5f293;hpb=e1384618cb6d1c06ec570d7798b783fa04a3d807;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java
index 78d6024f9..6d5a6ed02 100644
--- a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java
+++ b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java
@@ -34,7 +34,7 @@ public class Activator implements BundleActivator {
 	public void start(BundleContext bundleContext) throws Exception {
 		try {
 			info("SLC OSGi bootstrap starting...");
-//			installUrls(bundleContext, getDevLocationsUrls());
+			// installUrls(bundleContext, getDevLocationsUrls());
 
 			installUrls(bundleContext, getLocationsUrls());
 
@@ -329,20 +329,18 @@ public class Activator implements BundleActivator {
 		}
 	}
 
+	/** Key is location */
 	protected static Map<String, Bundle> getInstalledBundles(
 			BundleContext bundleContext) {
 		Map<String, Bundle> installedBundles = new HashMap<String, Bundle>();
 
 		for (Bundle bundle : bundleContext.getBundles()) {
-			String key = bundle.getSymbolicName();
-			if (key == null) {
-				key = bundle.getLocation();
-			}
-			installedBundles.put(key, bundle);
+			installedBundles.put(bundle.getLocation(), bundle);
 		}
 		return installedBundles;
 	}
 
+	/** Key is symbolic name */
 	protected static Map<String, Bundle> getBundles(BundleContext bundleContext) {
 		Map<String, Bundle> installedBundles = new HashMap<String, Bundle>();
 		for (Bundle bundle : bundleContext.getBundles())