Author: ningjiang Date: Wed Nov 21 14:49:49 2012 New Revision: 1412133 URL: http://svn.apache.org/viewvc?rev=1412133&view=rev Log: CAMEL-5810 Fixed the issue of CXF + Code first + No recipient list + doCatch = route returns null Merged revisions 1412126 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1412126 | ningjiang | 2012-11-21 22:30:34 +0800 (Wed, 21 Nov 2012) | 11 lines CAMEL-5810 Fixed the issue of CXF + Code first + No recipient list + doCatch = route returns null Merged revisions 1412100 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1412100 | ningjiang | 2012-11-21 21:54:02 +0800 (Wed, 21 Nov 2012) | 1 line CAMEL-5810 Fixed the issue of CXF + Code first + No recipient list + doCatch = route returns null ........ ................ Added: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerWithTryCatchTest.java - copied unchanged from r1412126, camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerWithTryCatchTest.java 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:r1412100 Merged /camel/branches/camel-2.10.x:r1412126 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=1412133&r1=1412132&r2=1412133&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 Wed Nov 21 14:49:49 2012 @@ -279,9 +279,16 @@ public class DefaultCxfBinding implement org.apache.camel.Message response; if (camelExchange.getPattern().isOutCapable()) { - response = camelExchange.getOut(); + if (camelExchange.hasOut()) { + response = camelExchange.getOut(); + LOG.debug("Get the response from the out message"); + } else { // Take the in message as a fall back + response = camelExchange.getIn(); + LOG.debug("Get the response from the in message as a fallback"); + } } else { response = camelExchange.getIn(); + LOG.debug("Get the response from the in message"); } // propagate response context
