Index: DispatchImpl.java
===================================================================
--- DispatchImpl.java   (revision 5575)
+++ DispatchImpl.java   (working copy)
@@ -232,6 +232,9 @@
          if (handlerPass)
          {
             Map<String, Object> callProps = new HashMap<String, Object>(getRequestContext());
+            if (callProps.containsKey(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)) {
+               targetAddress = (String) callProps.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
+            }
             EndpointInfo epInfo = new EndpointInfo(epMetaData, targetAddress, callProps);
             resMsg = getRemotingConnection().invoke(reqMsg, epInfo, false);