[jbossws-commits] JBossWS SVN: r9477 - in stack/native/branches/dlofthouse/JBPAPP-1746/src/main/java/org/jboss/ws: extensions/security and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2009-03-03 13:48:01 -0500 (Tue, 03 Mar 2009)
New Revision: 9477

Modified:
   stack/native/branches/dlofthouse/JBPAPP-1746/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
   stack/native/branches/dlofthouse/JBPAPP-1746/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
Log:
Backport 3

Modified: stack/native/branches/dlofthouse/JBPAPP-1746/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-1746/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java	2009-03-03 18:39:19 UTC (rev 9476)
+++ stack/native/branches/dlofthouse/JBPAPP-1746/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java	2009-03-03 18:48:01 UTC (rev 9477)
@@ -233,6 +233,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);
 
@@ -281,6 +284,10 @@
    {
       MessageAbstraction reqMsg = getRequestMessage(obj);
       String targetAddress = epMetaData.getEndpointAddress();
+      Map<String, Object> callProps = new HashMap<String, Object>(getRequestContext());
+      if (callProps.containsKey(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)) {
+         targetAddress = (String) callProps.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
+      }
       MessageAbstraction resMsg = getRemotingConnection().invoke(reqMsg, targetAddress, false);
       Object retObj = getReturnObject(resMsg);
       return retObj;

Modified: stack/native/branches/dlofthouse/JBPAPP-1746/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-1746/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java	2009-03-03 18:39:19 UTC (rev 9476)
+++ stack/native/branches/dlofthouse/JBPAPP-1746/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java	2009-03-03 18:48:01 UTC (rev 9477)
@@ -167,8 +167,13 @@
             opMetaData = soapMessage.getOperationMetaData(epMetaData);
          }
 
-         String operation = opMetaData.getQName().toString();
-         String port = opMetaData.getEndpointMetaData().getPortName().getLocalPart();
+         String operation = null;
+         String port = null;
+         if (opMetaData != null)
+         {
+            operation = opMetaData.getQName().toString();
+            port = opMetaData.getEndpointMetaData().getPortName().getLocalPart();
+         }
 
          List<OperationDescription<RequireOperation>> operations = buildRequireOperations(config, operation, port);