SPR-7439 - JSON (jackson) @RequestBody marshalling throws awkward exception

poutsma · poutsma · commit fa3e9bdfddf6 · 2011-06-06T10:33:04.000Z
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/org.springframework.web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
@@ -16,6 +16,7 @@
 
 package org.springframework.http.converter.json;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
@@ -137,6 +138,9 @@ protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
 		catch (JsonParseException ex) {
 			throw new HttpMessageNotReadableException("Could not read JSON: " + ex.getMessage(), ex);
 		}
+		catch (EOFException ex) {
+			throw new HttpMessageNotReadableException("Could not read JSON: " + ex.getMessage(), ex);
+		}
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`package org.springframework.http.converter.json;`
`18`	`18`
	`19`	`+import java.io.EOFException;`
`19`	`20`	`import java.io.IOException;`
`20`	`21`	`import java.nio.charset.Charset;`
`21`	`22`	`import java.util.List;`
`@@ -137,6 +138,9 @@ protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)`
`137`	`138`	`catch (JsonParseException ex) {`
`138`	`139`	`throw new HttpMessageNotReadableException("Could not read JSON: " + ex.getMessage(), ex);`
`139`	`140`	`}`
	`141`	`+ catch (EOFException ex) {`
	`142`	`+ throw new HttpMessageNotReadableException("Could not read JSON: " + ex.getMessage(), ex);`
	`143`	`+ }`
`140`	`144`	`}`
`141`	`145`
`142`	`146`	`@Override`