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=2f846ccb7a102663e5b10ba9986eaac2d0e7d130;hb=3779f02dcb5f24beee8fc08b5f5876af446dab41;hp=f282f948301b8b9f4b1577fbd48f07a9c561b827;hpb=2bdb0d14599c1f6d75af6e6b4c481009832d5dfb;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 f282f9483..2f846ccb7 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 @@ -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; @@ -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.");