Author: dkulp Date: Tue Dec 18 21:19:03 2012 New Revision: 1423661 URL: http://svn.apache.org/viewvc?rev=1423661&view=rev Log: Merged revisions 1423650 via git cherry-pick from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........ r1423650 | dkulp | 2012-12-18 16:12:18 -0500 (Tue, 18 Dec 2012) | 10 lines Merged revisions 1423644 via git cherry-pick from https://svn.apache.org/repos/asf/camel/trunk ........ r1423644 | dkulp | 2012-12-18 15:57:59 -0500 (Tue, 18 Dec 2012) | 2 lines [CAMEL-5897] FIx a potential NPE ........ ........ Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1423661&r1=1423660&r2=1423661&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java Tue Dec 18 21:19:03 2012 @@ -147,7 +147,8 @@ public final class CxfPayloadConverter { if (CxfPayload.class.isAssignableFrom(value.getClass())) { CxfPayload<?> payload = (CxfPayload<?>) value; - if (payload.getBodySources().size() == 1) { + if (payload.getBodySources() != null + && payload.getBodySources().size() == 1) { if (type.isAssignableFrom(Document.class)) { Source s = payload.getBodySources().get(0); Document d;
