svn commit: r773645 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: SynapseConstants.java core/axis2/Axis2FlexibleMEPClient.java

[ru...@apache.org]

Author: ruwan
Date: Mon May 11 18:32:25 2009
New Revision: 773645

URL: http://svn.apache.org/viewvc?rev=773645&view=rev
Log:
reverting the default behavior to remove addressing (SYNAPSE-525)

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

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?rev=773645&r1=773644&r2=773645&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java Mon May 11 18:32:25 2009
@@ -145,7 +145,7 @@
         public static final String OUT_ONLY = "OUT_ONLY";
         /** The Synapse MC property that states that existing WS-A headers in the envelope should
         * be preserved */
-        public static final String REMOVE_WS_ADDRESSING = "REMOVE_WS_ADDRESSING";
+        public static final String PRESERVE_WS_ADDRESSING = "PRESERVE_WS_ADDRESSING";
 
         //-- error handling --
         /** An Axis2 message context property indicating a transport send failure */

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=773645&r1=773644&r2=773645&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Mon May 11 18:32:25 2009
@@ -114,7 +114,7 @@
         // create a new MessageContext to be sent out as this should not corrupt the original
         // we need to create the response to the original message later on
         MessageContext axisOutMsgCtx = cloneForSend(originalInMsgCtx,
-            (String) synapseOutMessageContext.getProperty(SynapseConstants.REMOVE_WS_ADDRESSING));
+            (String) synapseOutMessageContext.getProperty(SynapseConstants.PRESERVE_WS_ADDRESSING));
 
         if (log.isDebugEnabled()) {
             log.debug("Message [Original Request Message ID : "
@@ -317,16 +317,16 @@
         mepClient.execute(true);        
    }
 
-    private static MessageContext cloneForSend(MessageContext ori, String removeWSAdd)
+    private static MessageContext cloneForSend(MessageContext ori, String preserveAddressing)
             throws AxisFault {
 
         MessageContext newMC = MessageHelper.clonePartially(ori);
 
         newMC.setEnvelope(ori.getEnvelope());
-        if (removeWSAdd != null && Boolean.parseBoolean(removeWSAdd)) {
-            MessageHelper.removeAddressingHeaders(newMC);
-        } else {
+        if (preserveAddressing != null && Boolean.parseBoolean(preserveAddressing)) {
             newMC.setMessageID(ori.getMessageID());
+        } else {
+            MessageHelper.removeAddressingHeaders(newMC);
         }
 
         newMC.setProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS,