From 816c1f47a4a9638d9442b5060312a6b2082eb7b1 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 10 May 2012 17:17:29 -0400 Subject: [PATCH] Translate EOF to HttpMessageNotReadableException The MappingJacksonHttpMessageConverter now catches all IOException types raised while reading JSON and translates them into HttpMessageNotReadableException. Issue: SPR-9238 --- .../converter/json/MappingJackson2HttpMessageConverter.java | 2 +- .../http/converter/json/MappingJacksonHttpMessageConverter.java | 2 +- src/dist/changelog.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java index a717ecbe29..4e01b51f12 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java @@ -148,7 +148,7 @@ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConv try { return this.objectMapper.readValue(inputMessage.getBody(), javaType); } - catch (JsonProcessingException ex) { + catch (IOException ex) { throw new HttpMessageNotReadableException("Could not read JSON: " + ex.getMessage(), ex); } } diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java index b26d8bc954..51bc4d5037 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java @@ -148,7 +148,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve try { return this.objectMapper.readValue(inputMessage.getBody(), javaType); } - catch (JsonProcessingException ex) { + catch (IOException ex) { throw new HttpMessageNotReadableException("Could not read JSON: " + ex.getMessage(), ex); } } diff --git a/src/dist/changelog.txt b/src/dist/changelog.txt index 62668e91f3..b528b90857 100644 --- a/src/dist/changelog.txt +++ b/src/dist/changelog.txt @@ -17,6 +17,7 @@ Changes in version 3.2 M1 * add pretty print option to Jackson HttpMessageConverter and View types * fix issue with resolving Errors controller method argument * detect controller methods via InitializingBean in RequestMappingHandlerMapping +* translate IOException from Jackson to HttpMessageNotReadableException Changes in version 3.1.1 (2012-02-16) -------------------------------------