diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java index d6f5b49f6c..19b22fef2c 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java @@ -357,7 +357,9 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener ObjectMapper objectMapper = selectObjectMapper(javaType.getRawClass(), contentType); Assert.state(objectMapper != null, "No ObjectMapper for " + javaType); - boolean isUnicode = ENCODINGS.containsKey(charset.name()); + boolean isUnicode = ENCODINGS.containsKey(charset.name()) || + "UTF-16".equals(charset.name()) || + "UTF-32".equals(charset.name()); try { if (inputMessage instanceof MappingJacksonInputMessage) { Class deserializationView = ((MappingJacksonInputMessage) inputMessage).getDeserializationView();