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

[asankha]

Author: asankha
Date: Tue Mar 24 06:31:45 2009
New Revision: 757672

URL: http://svn.apache.org/viewvc?rev=757672&view=rev
Log:
fix SYNAPSE-422

Modified:
    
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/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=757672&r1=757671&r2=757672&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
 Tue Mar 24 06:31:45 2009
@@ -113,7 +113,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);
+        MessageContext axisOutMsgCtx = cloneForSend(originalInMsgCtx, 
wsAddressingEnabled);
 
         if (log.isDebugEnabled()) {
             log.debug("Message [Original Request Message ID : " + 
synapseOutMessageContext.getMessageID()
@@ -317,12 +317,14 @@
         mepClient.execute(true);        
    }
 
-    private static MessageContext cloneForSend(MessageContext ori) throws 
AxisFault {
+    private static MessageContext cloneForSend(MessageContext ori, boolean 
wsAddressingEnabled) throws AxisFault {
 
         MessageContext newMC = MessageHelper.clonePartially(ori);
 
-        newMC.setEnvelope(ori.getEnvelope());        
-        MessageHelper.removeAddressingHeaders(newMC);
+        newMC.setEnvelope(ori.getEnvelope());
+        if (wsAddressingEnabled) {
+            MessageHelper.removeAddressingHeaders(newMC);
+        }
 
         
newMC.setProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS,
             
ori.getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS));