Author: ningjiang Date: Sun Mar 25 14:21:01 2012 New Revision: 1305048 URL: http://svn.apache.org/viewvc?rev=1305048&view=rev Log: Merged revisions 1305039 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................ r1305039 | ningjiang | 2012-03-25 22:05:13 +0800 (Sun, 25 Mar 2012) | 9 lines Merged revisions 1305008 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1305008 | ningjiang | 2012-03-25 19:32:28 +0800 (Sun, 25 Mar 2012) | 1 line CAMEL-5116 CxfDestination should copy the in message header to the out message ........ ................ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1305008 Merged /camel/branches/camel-2.9.x:r1305039 Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=1305048&r1=1305047&r2=1305048&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java (original) +++ camel/branches/camel-2.8.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java Sun Mar 25 14:21:01 2012 @@ -253,6 +253,8 @@ public class CamelDestination extends Ab } protected void propagateResponseHeadersToCamel(Message outMessage, Exchange camelExchange) { + // copy the camel in message header to the out message + camelExchange.getOut().getHeaders().putAll(camelExchange.getIn().getHeaders()); CxfHeaderHelper.propagateCxfToCamel(headerFilterStrategy, outMessage, camelExchange.getOut().getHeaders(), camelExchange); }
