Skip to content

Commit 0c3c072

Browse files
committed
Fix logging issue with MessageConverter
This commit fixes an issue with MappingJackson2HttpMessageConverter where it always logs a Warning, even if another message converter can handle it. Issue: SPR-14163
1 parent 88b5b12 commit 0c3c072

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java

+4-17
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ protected AbstractJackson2HttpMessageConverter(ObjectMapper objectMapper, MediaT
8686
this.setDefaultCharset(DEFAULT_CHARSET);
8787
}
8888

89-
9089
/**
9190
* Set the {@code ObjectMapper} for this view.
9291
* If not set, a default {@link ObjectMapper#ObjectMapper() ObjectMapper} is used.
@@ -148,14 +147,8 @@ public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
148147
return true;
149148
}
150149
Throwable cause = causeRef.get();
151-
if (cause != null) {
152-
String msg = "Failed to evaluate deserialization for type " + javaType;
153-
if (logger.isDebugEnabled()) {
154-
logger.warn(msg, cause);
155-
}
156-
else {
157-
logger.warn(msg + ": " + cause);
158-
}
150+
if (cause != null && logger.isDebugEnabled()) {
151+
logger.warn("Failed to evaluate deserialization for type " + javaType, cause);
159152
}
160153
return false;
161154
}
@@ -170,14 +163,8 @@ public boolean canWrite(Class<?> clazz, MediaType mediaType) {
170163
return true;
171164
}
172165
Throwable cause = causeRef.get();
173-
if (cause != null) {
174-
String msg = "Failed to evaluate serialization for type [" + clazz + "]";
175-
if (logger.isDebugEnabled()) {
176-
logger.warn(msg, cause);
177-
}
178-
else {
179-
logger.warn(msg + ": " + cause);
180-
}
166+
if (cause != null && logger.isDebugEnabled()) {
167+
logger.warn("Failed to evaluate serialization for type [" + clazz + "]", cause);
181168
}
182169
return false;
183170
}

0 commit comments

Comments
 (0)