Author: heiko.braun(a)jboss.com Date: 2007-11-08 09:50:41 -0500 (Thu, 08 Nov 2007) New Revision: 5016 Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java Log: Fix JBPAPP-407: DOMUtils doesn't clear thread locals Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2007-11-08 13:47:12 UTC (rev 5015) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2007-11-08 14:50:41 UTC (rev 5016) @@ -38,6 +38,7 @@ import javax.xml.ws.wsaddressing.W3CEndpointReference; import org.jboss.util.NotImplementedException; +import org.jboss.ws.core.utils.DOMUtils; import org.w3c.dom.Element; /** @@ -59,6 +60,7 @@ public ServiceDelegate createServiceDelegate(URL wsdlLocation, QName serviceName, Class serviceClass) { ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass); + DOMUtils.clearThreadLocals(); return delegate; } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-11-08 13:47:12 UTC (rev 5015) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-11-08 14:50:41 UTC (rev 5016) @@ -67,6 +67,7 @@ import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.SOAPConnectionImpl; import org.jboss.ws.core.utils.ThreadLocalAssociation; +import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; @@ -490,6 +491,8 @@ // clear thread local storage ThreadLocalAssociation.clear(); + + DOMUtils.clearThreadLocals(); } } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-11-08 13:47:12 UTC (rev 5015) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-11-08 14:50:41 UTC (rev 5016) @@ -93,6 +93,12 @@ { } + public static void clearThreadLocals() + { + documentThreadLocal.remove(); + builderThreadLocal.remove(); + } + /** Initialise the the DocumentBuilder */ public static DocumentBuilder getDocumentBuilder() Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2007-11-08 13:47:12 UTC (rev 5015) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2007-11-08 14:50:41 UTC (rev 5016) @@ -71,8 +71,8 @@ public static void clear() { - invokerMDBAssoc.set(null); - msgContextAssoc.set(null); - strTransformAssoc.set(null); + invokerMDBAssoc.remove(); + msgContextAssoc.remove(); + strTransformAssoc.remove(); } }