Improve SDK

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.osgi / src / main / java / org / argeo / slc / osgi / BundlesManager.java

diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java
index f282f948301b8b9f4b1577fbd48f07a9c561b827..5f50bf84fb1c5ba42a81920d17be130a37f74167 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java
@@ -22,6 +22,7 @@ import org.springframework.osgi.context.event.OsgiBundleApplicationContextListen
 import org.springframework.osgi.context.event.OsgiBundleContextClosedEvent;
 import org.springframework.osgi.context.event.OsgiBundleContextFailedEvent;
 import org.springframework.osgi.context.event.OsgiBundleContextRefreshedEvent;
+import org.springframework.osgi.util.OsgiBundleUtils;
 import org.springframework.osgi.util.OsgiFilterUtils;
 import org.springframework.util.Assert;
 
@@ -90,9 +91,9 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
                        }
 
                        if (log.isDebugEnabled())
-                               log.debug("Bundle " + bundle.getSymbolicName()
-                                               + " ready to be used at latest version."
-                                               + " (upgrade performed in " + (end - begin) + "ms).");
+                               log.debug("Bundle '" + bundle.getSymbolicName()
+                                               + "' upgraded and ready " + " (upgrade performed in "
+                                               + (end - begin) + "ms).");
 
                        if (log.isTraceEnabled()) {
                                ApplicationContext applicationContext = (ApplicationContext) bundleContext
@@ -302,7 +303,10 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
                                Assert.isTrue(osgiBundle.getVersion().equals(
                                                bundle.getHeaders().get(Constants.BUNDLE_VERSION)),
                                                "version consistent");
-               } else {
+               } else if (osgiBundle.getVersion() == null) {
+                       bundle = OsgiBundleUtils.findBundleBySymbolicName(bundleContext,
+                                       osgiBundle.getName());
+               } else {// scan all bundles
                        bundles: for (Bundle b : bundleContext.getBundles()) {
                                if (b.getSymbolicName() == null) {
                                        log.warn("Bundle " + b + " has no symbolic name defined.");