Updated Branches: refs/heads/camel-2.11.x a52f9b235 -> 55774b328 refs/heads/camel-2.12.x f0e979e53 -> 89b0d7fec
CAMEL-7181 Propagate the attachments information when the CXF endpoint is POJO without enabling the MTOM Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/89b0d7fe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/89b0d7fe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/89b0d7fe Branch: refs/heads/camel-2.12.x Commit: 89b0d7fec333edb084923e6bd9a3b747f812fb4e Parents: f0e979e Author: Willem Jiang <willem.ji...@gmail.com> Authored: Sat Feb 8 10:36:40 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Sat Feb 8 10:39:02 2014 +0800 ---------------------------------------------------------------------- .../java/org/apache/camel/component/cxf/DefaultCxfBinding.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/89b0d7fe/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java index 8f2b3e2..cffce26 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java @@ -168,8 +168,9 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware propagateHeadersFromCxfToCamel(cxfMessage, camelExchange.getOut(), camelExchange); DataFormat dataFormat = camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.class); - // propagate attachments if the data format is not POJO - if (cxfMessage.getAttachments() != null && !DataFormat.POJO.equals(dataFormat)) { + boolean isXop = Boolean.valueOf(camelExchange.getProperty(Message.MTOM_ENABLED, String.class)); + // propagate attachments if the data format is not POJO with MTOM enabled + if (cxfMessage.getAttachments() != null && !(DataFormat.POJO.equals(dataFormat) && !isXop)) { // propagate attachments for (Attachment attachment : cxfMessage.getAttachments()) { camelExchange.getOut().addAttachment(attachment.getId(), attachment.getDataHandler());
