Author: hiranya
Date: Mon May 25 08:51:33 2009
New Revision: 778356

URL: http://svn.apache.org/viewvc?rev=778356&view=rev
Log:
Committing a trivial fix for SYNAPSE-552. Modified Axis2Sender#sendBack to 
check the message context for PRESERVE_WS_ADDRESSING property and preserve the 
headers as necessary.

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java?rev=778356&r1=778355&r2=778356&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
 Mon May 25 08:51:33 2009
@@ -116,9 +116,14 @@
                 messageContext.setProperty(
                         
AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.FALSE);
             }
-            
-            MessageHelper.removeAddressingHeaders(messageContext);
-            messageContext.setMessageID(UUIDGenerator.getUUID());
+
+            String preserveAddressing = (String) 
smc.getProperty(SynapseConstants.PRESERVE_WS_ADDRESSING);
+            if (Boolean.parseBoolean(preserveAddressing)) {
+                messageContext.setMessageID(smc.getMessageID());
+            } else {
+                MessageHelper.removeAddressingHeaders(messageContext);
+                messageContext.setMessageID(UUIDGenerator.getUUID());
+            }
 
             // temporary workaround for 
https://issues.apache.org/jira/browse/WSCOMMONS-197
             if 
(messageContext.isEngaged(SynapseConstants.SECURITY_MODULE_NAME) &&


Reply via email to