Author: ningjiang Date: Tue Nov 27 10:11:34 2012 New Revision: 1414060 URL: http://svn.apache.org/viewvc?rev=1414060&view=rev Log: CAMEL-5823 CxfConsumer should not populate the cxf response with the original input message if the cxfExchange is oneway, with thanks to Aki
Merged revisions 1414025 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x ................ r1414025 | ningjiang | 2012-11-27 17:01:33 +0800 (Tue, 27 Nov 2012) | 11 lines CAMEL-5823 CxfConsumer should not populate the cxf response with the original input message if the cxfExchange is oneway, with thanks to Aki Merged revisions 1414022 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1414022 | ningjiang | 2012-11-27 16:52:40 +0800 (Tue, 27 Nov 2012) | 1 line CAMEL-5823 CxfConsumer should not populate the cxf response with the original input message if the cxfExchange is oneway, with thanks to Aki ........ ................ Added: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java - copied unchanged from r1414025, camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java camel/branches/camel-2.9.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/CxfOneWayRouteBeans.xml - copied unchanged from r1414025, camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/CxfOneWayRouteBeans.xml Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1414022 Merged /camel/branches/camel-2.10.x:r1414025 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1414060&r1=1414059&r2=1414060&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Tue Nov 27 10:11:34 2012 @@ -274,6 +274,10 @@ public class DefaultCxfBinding implement public void populateCxfResponseFromExchange(Exchange camelExchange, org.apache.cxf.message.Exchange cxfExchange) { + if (cxfExchange.isOneWay()) { + return; + } + // create response context Map<String, Object> responseContext = new HashMap<String, Object>();
