Build new <wsa:MessageID> rather than propagating from Tuscany Message.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1211926 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 5 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
index 19d2f72c27..cec0b1c6b1 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
@@ -363,12 +363,10 @@ public class JAXWSBindingInvoker implements Invoker, DataExchangeSemantics {
 
             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);
             }