X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Forg%2Fargeo%2Fslc%2Fosgi%2FOsgiExecutionModulesManager.java;h=f15be6bc211578af058842fd2b39ff23b0b7ac6a;hb=0bdf6d74bb140c84fe996586df694bda616ae28b;hp=5718f2df025524dcd868713f7886e05548a54f40;hpb=77558c9785abc8fecd31c049f8eaa67cb86a4b38;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java b/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java index 5718f2df0..f15be6bc2 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java +++ b/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java @@ -46,6 +46,7 @@ import org.argeo.slc.execution.ExecutionFlowDescriptorConverter; import org.argeo.slc.execution.ExecutionModuleDescriptor; import org.argeo.slc.execution.ExecutionModulesListener; import org.argeo.slc.execution.RealizedFlow; +import org.eclipse.gemini.blueprint.service.importer.OsgiServiceLifecycleListener; import org.osgi.framework.Bundle; import org.osgi.framework.BundleEvent; import org.osgi.framework.BundleException; @@ -53,7 +54,6 @@ import org.osgi.framework.BundleListener; import org.osgi.framework.Constants; import org.osgi.framework.launch.Framework; import org.springframework.context.ApplicationContext; -import org.eclipse.gemini.blueprint.service.importer.OsgiServiceLifecycleListener; /** Execution modules manager implementation based on an OSGi runtime. */ public class OsgiExecutionModulesManager extends @@ -346,7 +346,7 @@ public class OsgiExecutionModulesManager extends + bundle.getSymbolicName() + ")"; try { bundlesManager.getServiceRefSynchronous( - ApplicationContext.class.getName(), filter); + ApplicationContext.class, filter); } catch (Exception e) { // stop if application context not found bundle.stop(); @@ -497,7 +497,7 @@ public class OsgiExecutionModulesManager extends public synchronized void unregister(ExecutionFlow executionFlow, Map properties) { // FIXME why are properties null? - if(properties==null) + if (properties == null) return; OsgiBundle osgiBundle = asOsgiBundle(properties); if (executionFlows.containsKey(osgiBundle)) {