You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2013/08/12 09:53:51 UTC
git commit: [CAMEL-6625]potential NPE in CxfConsumer if the PAYLOAD
not match the ServiceModel
Updated Branches:
refs/heads/master 7c066bf4e -> 70b400866
[CAMEL-6625]potential NPE in CxfConsumer if the PAYLOAD not match the ServiceModel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70b40086
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70b40086
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70b40086
Branch: refs/heads/master
Commit: 70b40086608ca99bebd563d97a2b5f3c15488495
Parents: 7c066bf
Author: Freeman Fang <fr...@gmail.com>
Authored: Mon Aug 12 15:53:13 2013 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Mon Aug 12 15:53:13 2013 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/cxf/CxfConsumer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/70b40086/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
index 7c095e1..a8c29f8 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
@@ -152,7 +152,7 @@ public class CxfConsumer extends DefaultConsumer {
BindingOperationInfo boi = cxfExchange.getBindingOperationInfo();
// make sure the "boi" is remained as wrapped in PAYLOAD mode
- if (dataFormat == DataFormat.PAYLOAD && boi.isUnwrapped()) {
+ if (boi != null && dataFormat == DataFormat.PAYLOAD && boi.isUnwrapped()) {
boi = boi.getWrappedOperation();
cxfExchange.put(BindingOperationInfo.class, boi);
}