Author: alessio.soldano(a)jboss.com Date: 2010-08-04 06:50:26 -0400 (Wed, 04 Aug 2010) New Revision: 12726 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java Log: [JBWS-3098] Properly shutting down bus together with the created endpoints Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-04 07:45:29 UTC (rev 12725) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-04 10:50:26 UTC (rev 12726) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.stack.cxf.configuration; +import java.util.LinkedList; import java.util.List; import javax.xml.ws.soap.SOAPBinding; @@ -55,6 +56,7 @@ private boolean configured = false; protected DDBeans metadata; + protected List<EndpointImpl> endpoints = new LinkedList<EndpointImpl>(); public NonSpringBusHolder(DDBeans metadata) { @@ -97,6 +99,7 @@ endpoint.setServiceName(dde.getServiceName()); endpoint.setWsdlLocation(dde.getWsdlLocation()); endpoint.publish(); + endpoints.add(endpoint); if (dde.isMtomEnabled()) { SOAPBinding binding = (SOAPBinding) endpoint.getBinding(); @@ -106,6 +109,18 @@ } configured = true; } + + @Override + public void close() + { + for (EndpointImpl endpoint : endpoints) + { + endpoint.stop(); + } + endpoints.clear(); + bus.shutdown(true); + super.close(); + } private static Object newInstance(String className) {