Author: ruwan Date: Mon May 11 11:56:29 2009 New Revision: 35513 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=35513
Log: sync up with synapse trunk Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?rev=35513&r1=35512&r2=35513&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java Mon May 11 11:56:29 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: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=35513&r1=35512&r2=35513&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Mon May 11 11:56:29 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, _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
