Author: ningjiang Date: Wed Nov 9 13:24:50 2011 New Revision: 1199740 URL: http://svn.apache.org/viewvc?rev=1199740&view=rev Log: Merged revisions 1199732 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
................ r1199732 | ningjiang | 2011-11-09 21:02:21 +0800 (Wed, 09 Nov 2011) | 9 lines Merged revisions 1199703 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1199703 | ningjiang | 2011-11-09 19:52:04 +0800 (Wed, 09 Nov 2011) | 1 line CAMEL-4649 Fixed the NPE issue of DefaultCxfBinding when the soap body is empty ........ ................ Modified: camel/branches/camel-2.7.x/ (props changed) camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 9 13:24:50 2011 @@ -1,2 +1,2 @@ -/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138 -/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137 +/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732 +/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703 Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Wed Nov 9 13:24:50 2011 @@ -1 +1 @@ -/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1170965-1171083,1171085-1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138 +/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1170965-1171083,1171085-1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732 Modified: camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1199740&r1=1199739&r2=1199740&view=diff ============================================================================== --- camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original) +++ camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Wed Nov 9 13:24:50 2011 @@ -396,7 +396,7 @@ public class DefaultCxfBinding implement int i = 0; if (boi.getOutput() != null) { for (MessagePartInfo partInfo : boi.getOutput().getMessageParts()) { - if (elements.size() > i) { + if (elements != null && elements.size() > i) { answer.put(partInfo, elements.get(i++)); } }
