Updated Branches: refs/heads/camel-2.11.x f50c918d8 -> 2cdf2e780 refs/heads/camel-2.12.x 8c07c85d5 -> 3bb55bb3a
CAMEL-7181 fixe the test failure of CxfMtomPOJOProducerTest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3bb55bb3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3bb55bb3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3bb55bb3 Branch: refs/heads/camel-2.12.x Commit: 3bb55bb3adafad8f34903549704e3c0ba0e1ae36 Parents: 8c07c85 Author: Willem Jiang <[email protected]> Authored: Mon Feb 10 09:21:03 2014 +0800 Committer: Willem Jiang <[email protected]> Committed: Mon Feb 10 09:25:47 2014 +0800 ---------------------------------------------------------------------- .../java/org/apache/camel/component/cxf/DefaultCxfBinding.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3bb55bb3/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 cffce26..fa1735a 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 @@ -170,7 +170,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware DataFormat.class); 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)) { + if (cxfMessage.getAttachments() != null && !(DataFormat.POJO.equals(dataFormat) && isXop)) { // propagate attachments for (Attachment attachment : cxfMessage.getAttachments()) { camelExchange.getOut().addAttachment(attachment.getId(), attachment.getDataHandler());
