You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/09/16 08:30:14 UTC
svn commit: r1171400 - in /camel/branches/camel-2.8.x: ./
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
Author: ningjiang
Date: Fri Sep 16 06:30:13 2011
New Revision: 1171400
URL: http://svn.apache.org/viewvc?rev=1171400&view=rev
Log:
Merged revisions 1171396 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1171396 | ningjiang | 2011-09-16 14:19:22 +0800 (Fri, 16 Sep 2011) | 1 line
CAMEL-4452 avoid the NPE error when there oneway operation for the PayLoad invocation on CxfConsumer
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 16 06:30:13 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164544,1164557,1164633,1164972-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620,1170122,1170226,1170397,1170956
+/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164544,1164557,1164633,1164972-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620,1170122,1170226,1170397,1170956,1171396
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1171400&r1=1171399&r2=1171400&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Fri Sep 16 06:30:13 2011
@@ -390,11 +390,11 @@ public class DefaultCxfBinding implement
MessageContentsList answer = new MessageContentsList();
int i = 0;
-
- for (MessagePartInfo partInfo : boi.getOutput().getMessageParts()) {
- if (elements.size() > i) {
- answer.put(partInfo, elements.get(i++));
-
+ if (boi.getOutput() != null) {
+ for (MessagePartInfo partInfo : boi.getOutput().getMessageParts()) {
+ if (elements.size() > i) {
+ answer.put(partInfo, elements.get(i++));
+ }
}
}