Author: davsclaus
Date: Tue Mar 24 11:35:00 2009
New Revision: 757745
URL: http://svn.apache.org/viewvc?rev=757745&view=rev
Log:
Merged revisions 757743 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r757743 | davsclaus | 2009-03-24 12:32:49 +0100 (Tue, 24 Mar 2009) | 1 line
Transform should also propagate attachments.
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/ (props
changed)
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 24 11:35:00 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,757636,757693
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,757636,757693,757743
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java?rev=757745&r1=757744&r2=757745&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
Tue Mar 24 11:35:00 2009
@@ -42,9 +42,10 @@
Object newBody = expression.evaluate(exchange);
exchange.getOut().setBody(newBody);
- // propagate headers
+ // propagate headers and attachments
exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
-
+ exchange.getOut().setAttachments(exchange.getIn().getAttachments());
+
super.process(exchange);
}
Propchange: camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 24 11:35:00 2009
@@ -1 +1 @@
-/camel/trunk/components/camel-xmpp/src/test/resources:757693
+/camel/trunk/components/camel-xmpp/src/test/resources:757693,757743
