Merge pull request #437 from tbroyer/RESTEASY-1004

[RESTEASY-1004] FormUrlEncodedProvider never reads 'null' anymore
resteasy · Feb 18, 2014 · 3ddbc5b · 3ddbc5b
2 parents 086c2ba + 6c7315e
commit 3ddbc5b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...easy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/FormUrlEncodedProvider.java b/...easy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/FormUrlEncodedProvider.java
@@ -58,7 +58,7 @@ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotati
 
    public MultivaluedMap readFrom(Class<MultivaluedMap> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException
    {
-      if (NoContent.isContentLengthZero(httpHeaders)) return null;
+      if (NoContent.isContentLengthZero(httpHeaders)) return new MultivaluedMapImpl<String, String>();
       boolean encoded = FindAnnotation.findAnnotation(annotations, Encoded.class) != null;
       if (encoded) return parseForm(entityStream);
       else return Encode.decode(parseForm(entityStream));