Author: jim.ma Date: 2011-08-16 00:37:55 -0400 (Tue, 16 Aug 2011) New Revision: 14848 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java Log: [JBPAPP-5779]:JBossWS-EPR's address is NOT used for invocations on the endpoint when the dispatchImpl is created with EPR Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-08-15 17:02:58 UTC (rev 14847) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-08-16 04:37:55 UTC (rev 14848) @@ -526,6 +526,12 @@ 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, features); @@ -546,7 +552,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<Object> dispatch = createDispatch(portName, context, mode); initAddressingProperties(dispatch, epr); initWebserviceFeatures(dispatch, features);