Author: azeez
Date: Fri Jan 7 06:23:16 2011
New Revision: 1056197
URL: http://svn.apache.org/viewvc?rev=1056197&view=rev
Log:
Applying patch provided by Sameera Jayasoma for AXIS2-4610
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?rev=1056197&r1=1056196&r2=1056197&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
Fri Jan 7 06:23:16 2011
@@ -29,6 +29,7 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.ServiceLifeCycle;
import org.apache.axis2.i18n.Messages;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -185,7 +186,15 @@ public class ServiceDeployer extends Abs
fileName = serviceHierarchy + fileName;
}
AxisServiceGroup serviceGroup =
axisConfig.removeServiceGroup(fileName);
+ //Fixed - https://issues.apache.org/jira/browse/AXIS2-4610
if (serviceGroup != null) {
+ for (Iterator services = serviceGroup.getServices();
services.hasNext();) {
+ AxisService axisService = (AxisService) services.next();
+ ServiceLifeCycle serviceLifeCycle =
axisService.getServiceLifeCycle();
+ if (serviceLifeCycle != null) {
+ serviceLifeCycle.shutDown(configCtx, axisService);
+ }
+ }
configCtx.removeServiceGroupContext(serviceGroup);
log.info(Messages.getMessage(DeploymentErrorMsgs.SERVICE_REMOVED,
fileName));