Author: scottkurz
Date: Thu Dec  8 14:59:49 2011
New Revision: 1211926

URL: http://svn.apache.org/viewvc?rev=1211926&view=rev
Log:
Build new <wsa:MessageID> rather than propagating from Tuscany Message.

Modified:
    
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java?rev=1211926&r1=1211925&r2=1211926&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
 Thu Dec  8 14:59:49 2011
@@ -363,12 +363,10 @@ public class JAXWSBindingInvoker impleme
 
             addWSAActionHeader(sh, action);
 
-            // We need a wsa:MessageId for request-response operation per 
WS-Addressing core specification, (and Axis2 will choke if addressing module is 
enabled.)
+            // We need a wsa:MessageId for request-response operation per 
WS-Addressing core specification, 
+            // (and Axis2 will choke if addressing module is enabled.)
             if (!operation.isNonBlocking()) {
-                String messageId = 
(String)msg.getHeaders().get(Constants.MESSAGE_ID);
-                if (messageId == null) {
-                    messageId = UUID.randomUUID().toString();
-                }
+                String messageId = UUID.randomUUID().toString();
                 SOAPHeaderElement msgIdHeader = 
sh.addHeaderElement(QNAME_WSA_MESSAGEID);
                 msgIdHeader.setTextContent(messageId);
             }


Reply via email to