You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2008/07/09 16:09:11 UTC
svn commit: r675178 -
/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/deployment/ServiceRegistry.java
Author: saminda
Date: Wed Jul 9 07:09:10 2008
New Revision: 675178
URL: http://svn.apache.org/viewvc?rev=675178&view=rev
Log:
Fixed a possible null pointer when a service is removed from the system
Modified:
webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/deployment/ServiceRegistry.java
Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/deployment/ServiceRegistry.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/deployment/ServiceRegistry.java?rev=675178&r1=675177&r2=675178&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/deployment/ServiceRegistry.java (original)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/deployment/ServiceRegistry.java Wed Jul 9 07:09:10 2008
@@ -64,6 +64,7 @@
String elementName = rootElement.getLocalName();
Dictionary headers = bundle.getHeaders();
String bundleSymbolicName = (String) headers.get("Bundle-SymbolicName");
+ serviceGroup.setServiceGroupName(bundleSymbolicName);
HashMap wsdlServicesMap = new HashMap();
if (DeploymentConstants.TAG_SERVICE.equals(elementName)) {
AxisService axisService = new AxisService(bundleSymbolicName);
@@ -72,7 +73,13 @@
ServiceBuilder serviceBuilder = new OSGiServiceBuilder(configCtx, axisService);
serviceBuilder.setWsdlServiceMap(wsdlServicesMap);
AxisService service = serviceBuilder.populateService(rootElement);
- configCtx.getAxisConfiguration().addService(service);
+ ArrayList serviceList = new ArrayList();
+ serviceList.add(service);
+ DeploymentEngine.addServiceGroup(serviceGroup,
+ serviceList,
+ null,
+ null,
+ configCtx.getAxisConfiguration());
//TODO: use OSGi log service from compendum.
System.out.println("[Axis2/OSGi] Deployed axis2 service:" + service.getName() +
" in Bundle: " +