Jackson-based message converters consistently check media type first

jhoeller · jhoeller · commit 62ce9afe3a0f · 2016-04-14T14:26:05.000+02:00
Issue: SPR-14163
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
@@ -138,10 +138,10 @@ public boolean canRead(Class<?> clazz, MediaType mediaType) {
 
 	@Override
 	public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
-		JavaType javaType = getJavaType(type, contextClass);
 		if (!canRead(mediaType)) {
 			return false;
 		}
+		JavaType javaType = getJavaType(type, contextClass);
 		if (!logger.isWarnEnabled()) {
 			return this.objectMapper.canDeserialize(javaType);
 		}

Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,10 @@ public boolean canRead(Class<?> clazz, MediaType mediaType) {`
`138`	`138`
`139`	`139`	`@Override`
`140`	`140`	`public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {`
`141`		`- JavaType javaType = getJavaType(type, contextClass);`
`142`	`141`	`if (!canRead(mediaType)) {`
`143`	`142`	`return false;`
`144`	`143`	`}`
	`144`	`+ JavaType javaType = getJavaType(type, contextClass);`
`145`	`145`	`if (!logger.isWarnEnabled()) {`
`146`	`146`	`return this.objectMapper.canDeserialize(javaType);`
`147`	`147`	`}`