Author: sergeyb Date: Mon Sep 26 16:55:06 2011 New Revision: 1175954 URL: http://svn.apache.org/viewvc?rev=1175954&view=rev Log: Merged revisions 1175953 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1175953 | sergeyb | 2011-09-26 17:54:20 +0100 (Mon, 26 Sep 2011) | 9 lines Merged revisions 1175951 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1175951 | sergeyb | 2011-09-26 17:52:27 +0100 (Mon, 26 Sep 2011) | 1 line [CXF-3821] Adding an NPE guard to FormEncodingProvider ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 26 16:55:06 2011 @@ -1,2 +1,2 @@ -/cxf/branches/2.4.x-fixes:1172584,1173057,1173766,1174040,1174408,1175846,1175943 -/cxf/trunk:1172522,1173027,1173997-1173998,1174404,1175747-1175780,1175939 +/cxf/branches/2.4.x-fixes:1172584,1173057,1173766,1174040,1174408,1175846,1175943,1175953 +/cxf/trunk:1172522,1173027,1173997-1173998,1174404,1175747-1175780,1175939,1175951 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java?rev=1175954&r1=1175953&r2=1175954&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java Mon Sep 26 16:55:06 2011 @@ -83,6 +83,9 @@ public class FormEncodingProvider implem Class<Object> clazz, Type genericType, Annotation[] annotations, MediaType mt, MultivaluedMap<String, String> headers, InputStream is) throws IOException { + if (is == null) { + return null; + } try { if (mt.isCompatible(MediaType.MULTIPART_FORM_DATA_TYPE)) { MultipartBody body = AttachmentUtils.getMultipartBody(mc);
