Author: alessio.soldano(a)jboss.com Date: 2013-07-16 10:13:42 -0400 (Tue, 16 Jul 2013) New Revision: 17788 Modified: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java Log: [JBWS-3660] Always stop endpoint through lifecycle handler Modified: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java =================================================================== --- container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2013-07-16 14:13:22 UTC (rev 17787) +++ container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2013-07-16 14:13:42 UTC (rev 17788) @@ -55,16 +55,17 @@ @Override public void stop(Deployment dep) { - if (stopServices) { - final DeploymentUnit unit = getRequiredAttachment(dep, DeploymentUnit.class); - for (final Endpoint ep : dep.getService().getEndpoints()) { + for (final Endpoint ep : dep.getService().getEndpoints()) { + if (ep.getLifecycleHandler() != null) { + ep.getLifecycleHandler().stop(ep); + } + if (stopServices) { + final DeploymentUnit unit = getRequiredAttachment(dep, DeploymentUnit.class); LifecycleHandler lifecycleHandler = getLifecycleHandler(ep, false); if (lifecycleHandler != null) lifecycleHandler.stop(ep); EndpointService.uninstall(ep, unit); } - } else { - super.stop(dep); } }