Author: alessio.soldano(a)jboss.com Date: 2010-01-17 20:26:51 -0500 (Sun, 17 Jan 2010) New Revision: 11427 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java Log: [JBWS-2810] applying "UnifiedMetaData uses thread context loader ..." fix again + solving issue with Dispatch causing failures Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-01-17 23:57:23 UTC (rev 11426) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-01-18 01:26:51 UTC (rev 11427) @@ -148,7 +148,8 @@ } else { - UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot); + ClassLoader cl = serviceClass.getClassLoader(); + UnifiedMetaData wsMetaData = cl == null ? new UnifiedMetaData(vfsRoot) : new UnifiedMetaData(vfsRoot, cl); serviceMetaData = new ServiceMetaData(wsMetaData, serviceName); wsMetaData.addService(serviceMetaData); } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-01-17 23:57:23 UTC (rev 11426) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-01-18 01:26:51 UTC (rev 11427) @@ -66,9 +66,13 @@ */ public class JAXWSClientMetaDataBuilder extends JAXWSMetaDataBuilder { - public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL, UnifiedVirtualFile vfsRoot) { + return this.buildMetaData(serviceName, wsdlURL, vfsRoot, null); + } + + public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL, UnifiedVirtualFile vfsRoot, ClassLoader classLoader) + { if (wsdlURL == null) throw new IllegalArgumentException("Invalid wsdlURL: " + wsdlURL); @@ -76,7 +80,7 @@ log.debug("START buildMetaData: [service=" + serviceName + "]"); try { - UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot); + UnifiedMetaData wsMetaData = classLoader != null ? new UnifiedMetaData(vfsRoot, classLoader) : new UnifiedMetaData(vfsRoot); ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceName); wsMetaData.addService(serviceMetaData); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-17 23:57:23 UTC (rev 11426) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-18 01:26:51 UTC (rev 11427) @@ -78,11 +78,16 @@ public UnifiedMetaData(UnifiedVirtualFile vfsRoot) { + this(vfsRoot, SecurityActions.getContextClassLoader()); + } + + public UnifiedMetaData(UnifiedVirtualFile vfsRoot, ClassLoader classLoader) + { if (vfsRoot == null) throw new IllegalArgumentException("VFS root cannot be null"); this.vfsRoot = vfsRoot; - this.classLoader = SecurityActions.getContextClassLoader(); + this.classLoader = classLoader; } public ClassLoader getClassLoader()