svn commit: r766575 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: core/axis2/Axis2FlexibleMEPClient.java util/MessageHelper.java

[ruwan]

Author: ruwan
Date: Mon Apr 20 05:15:24 2009
New Revision: 766575

URL: http://svn.apache.org/viewvc?rev=766575&view=rev
Log:
removing the addressing headers from being copied in the options clonning - 
Related to the issue introduced by the SYNAPSE-525

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.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=766575&r1=766574&r2=766575&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 Apr 20 05:15:24 2009
@@ -242,9 +242,7 @@
                 new QName(AnonymousServiceFactory.OUT_ONLY_OPERATION) :
                 new QName(AnonymousServiceFactory.OUT_IN_OPERATION));
 
-        // FIXME: this causes serious troubles (see SYNAPSE-525)
-//        Options clientOptions = 
MessageHelper.cloneOptions(originalInMsgCtx.getOptions());
-        Options clientOptions = new Options();
+        Options clientOptions = 
MessageHelper.cloneOptions(originalInMsgCtx.getOptions());
         clientOptions.setUseSeparateListener(separateListener);
         // if RM is requested,
         if (wsRMEnabled) {

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java?rev=766575&r1=766574&r2=766575&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
 Mon Apr 20 05:15:24 2009
@@ -269,15 +269,6 @@
         
clonedOptions.setTimeOutInMilliSeconds(options.getTimeOutInMilliSeconds());
         clonedOptions.setUseSeparateListener(options.isUseSeparateListener());
 
-        // copy addressing related options
-        clonedOptions.setMessageId(options.getMessageId());
-        clonedOptions.setTo(options.getTo());
-        clonedOptions.setFrom(options.getFrom());
-        clonedOptions.setAction(options.getAction());
-        clonedOptions.setReplyTo(options.getReplyTo());
-        clonedOptions.setFaultTo(options.getFaultTo());
-        clonedOptions.setRelationships(options.getRelationships());
-
         // copy transport related options
         clonedOptions.setListener(options.getListener());
         clonedOptions.setTransportIn(options.getTransportIn());