CAMEL-6718: Marshal should leverage stream caching if enabled. Thanks to Franz Forsthofer for patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7002c750 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7002c750 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7002c750 Branch: refs/heads/camel-2.12.x Commit: 7002c750db31cdc00e453b76c4b8bcf15da11d31 Parents: cf3f160 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Sep 10 17:15:43 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Sep 10 17:16:06 2013 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/processor/MarshalProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7002c750/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java index c26d00a..efa2b8e 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java @@ -74,11 +74,11 @@ public class MarshalProcessor extends ServiceSupport implements AsyncProcessor, out.copyFrom(in); try { - dataFormat.marshal(exchange, body, os); - if (cos != null) { + dataFormat.marshal(exchange, body, cos); out.setBody(cos.newStreamCache()); } else { + dataFormat.marshal(exchange, body, os); byte[] data = os.toByteArray(); out.setBody(data); }
