You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/11/27 10:01:35 UTC

svn commit: r1414025 - in /camel/branches/camel-2.10.x: ./ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/ components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ components/camel-cxf/src/test/resources/org/apache/camel/co...

Author: ningjiang
Date: Tue Nov 27 09:01:33 2012
New Revision: 1414025

URL: http://svn.apache.org/viewvc?rev=1414025&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 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.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
      - copied unchanged from r1414022, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
    camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/CxfOneWayRouteBeans.xml
      - copied unchanged from r1414022, camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/CxfOneWayRouteBeans.xml
Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1414022

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1414025&r1=1414024&r2=1414025&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Tue Nov 27 09:01:33 2012
@@ -277,6 +277,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>();