Author: ffang
Date: Mon Feb 9 08:17:04 2009
New Revision: 742324
URL: http://svn.apache.org/viewvc?rev=742324&view=rev
Log:
[SMX4NMR-17]fix error for listSharedLibs
Modified:
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/AdminService.java
Modified:
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/AdminService.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/AdminService.java?rev=742324&r1=742323&r2=742324&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/AdminService.java
(original)
+++
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/AdminService.java
Mon Feb 9 08:17:04 2009
@@ -26,6 +26,7 @@
import org.apache.servicemix.jbi.deployer.ServiceUnit;
import org.apache.servicemix.jbi.deployer.handler.JBIDeploymentListener;
import org.apache.servicemix.jbi.deployer.impl.Deployer;
+import org.apache.servicemix.kernel.filemonitor.DeploymentListener;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
@@ -155,12 +156,19 @@
}
public Deployer getDeployer() throws InvalidSyntaxException {
- ServiceReference ref = OsgiServiceReferenceUtils.getServiceReference(
- getBundleContext(),
- JBIDeploymentListener.class.getName(),
- null);
- return (Deployer)
((JBIDeploymentListener)getBundleContext().getService(ref)).getDeployer();
- }
+ ServiceReference[] srvRefs =
getBundleContext().getAllServiceReferences(DeploymentListener.class.getName(),
null);
+ if(srvRefs != null) {
+ for(ServiceReference sr : srvRefs) {
+ DeploymentListener deploymentListener =
(DeploymentListener) getBundleContext().getService(sr);
+ if (deploymentListener instanceof
JBIDeploymentListener) {
+ return
((JBIDeploymentListener)deploymentListener).getDeployer();
+
+ }
+ }
+
+ }
+ return null;
+ }
/**
* Returns a list of Service Assemblies that contain SUs for the given
component.
