X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.osgi%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgi%2FBundlesManager.java;h=0e18f3599b7e65828928c64fc815468fc17e89f0;hb=f3e477b3048c639451df616cfa61564eae11efbb;hp=e24b7223b7736299125d5aae7f6ddd29b5a4d0f6;hpb=1ad9314cf24ac6c596ca4b168541bce641ac383f;p=gpl%2Fargeo-slc.git

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 e24b7223b..0e18f3599 100644
--- 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
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.osgi;
 
 import org.apache.commons.logging.Log;
@@ -22,6 +38,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;
 
@@ -62,7 +79,7 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
 			startSynchronous(bundle);
 
 			long aStart = System.currentTimeMillis();
-			if (log.isDebugEnabled()) {
+			if (log.isTraceEnabled()) {
 				log.debug("OSGi upgrade performed in " + (aStart - begin)
 						+ "ms for bundle " + osgiBundle);
 				log.debug(" stop \t: " + (bUpdate - bStop) + "ms");
@@ -83,19 +100,18 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
 			long aAppContext = System.currentTimeMillis();
 			long end = aAppContext;
 
-			if (log.isDebugEnabled()) {
+			if (log.isTraceEnabled()) {
 				log.debug("Application context refresh performed in "
 						+ (aAppContext - bAppContext) + "ms for bundle "
 						+ osgiBundle);
-				log.debug(" TOTAL\t: " + (aAppContext - bAppContext) + "ms");
 			}
 
-			if (log.isDebugEnabled()) {
-				log.debug("Bundle " + bundle.getSymbolicName()
-						+ " ready to be used at latest version."
-						+ " (upgrade performed in " + (end - begin) + "ms).");
-				log.debug(" TOTAL\t: " + (end - begin) + "ms");
+			if (log.isDebugEnabled())
+				log.debug("Bundle '" + bundle.getSymbolicName()
+						+ "' upgraded and ready " + " (upgrade performed in "
+						+ (end - begin) + "ms).");
 
+			if (log.isTraceEnabled()) {
 				ApplicationContext applicationContext = (ApplicationContext) bundleContext
 						.getService(sr);
 				int beanDefCount = applicationContext.getBeanDefinitionCount();
@@ -303,8 +319,16 @@ 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.");
+					continue bundles;
+				}
+
 				if (b.getSymbolicName().equals(osgiBundle.getName())) {
 					if (osgiBundle.getVersion() == null) {
 						bundle = b;