Author: alessio.soldano(a)jboss.com Date: 2011-03-14 04:21:56 -0400 (Mon, 14 Mar 2011) New Revision: 13893 Modified: stack/native/branches/jbossws-native-3.4.1.SP1/ stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/ Log: [JBWS-3198] merging fix in 3.4.1.SP1 Property changes on: stack/native/branches/jbossws-native-3.4.1.SP1 ___________________________________________________________________ Added: svn:mergeinfo + /stack/native/trunk:13578 Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-03-14 06:48:11 UTC (rev 13892) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-03-14 08:21:56 UTC (rev 13893) @@ -481,7 +481,11 @@ QName portName = null; NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr); portName = nepr.getEndpointName(); - + //From the JAXWS dispacth api, EPR's address MUST be used for invocations on the endpoint + if (getEndpointMetaData(portName) != null && nepr.getAddress() != null && nepr.getAddress().length() > 0) + { + getEndpointMetaData(portName).setEndpointAddress(nepr.getAddress()); + } Dispatch<T> dispatch = createDispatch(portName, type, mode); initAddressingProperties(dispatch, epr); initWebserviceFeatures(dispatch, this.features); Property changes on: stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT ___________________________________________________________________ Deleted: svn:mergeinfo -