[jbossws-commits] JBossWS SVN: r13927 - stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi.

[jbossws-commits at lists.jboss.org]

Author: jim.ma
Date: 2011-03-24 12:04:18 -0400 (Thu, 24 Mar 2011)
New Revision: 13927

Modified:
   stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
Log:
[JBWS-3198] merging fix in 3.4.0.SP1

Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java	2011-03-24 07:15:05 UTC (rev 13926)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java	2011-03-24 16:04:18 UTC (rev 13927)
@@ -482,6 +482,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, this.features);