Skip to content

Commit 121a3bf

Browse files
committed
Always invoke Jackson serialization with AtomicReference cause
Issue: SPR-15760 (cherry picked from commit 5f767a8)
1 parent e4031f2 commit 121a3bf

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ protected boolean canConvertFrom(Message<?> message, Class<?> targetClass) {
142142
return false;
143143
}
144144
JavaType javaType = this.objectMapper.constructType(targetClass);
145-
if (!logger.isWarnEnabled()) {
146-
return this.objectMapper.canDeserialize(javaType);
147-
}
148145
AtomicReference<Throwable> causeRef = new AtomicReference<Throwable>();
149146
if (this.objectMapper.canDeserialize(javaType, causeRef)) {
150147
return true;
@@ -158,9 +155,6 @@ protected boolean canConvertTo(Object payload, MessageHeaders headers) {
158155
if (payload == null || !supportsMimeType(headers)) {
159156
return false;
160157
}
161-
if (!logger.isWarnEnabled()) {
162-
return this.objectMapper.canSerialize(payload.getClass());
163-
}
164158
AtomicReference<Throwable> causeRef = new AtomicReference<Throwable>();
165159
if (this.objectMapper.canSerialize(payload.getClass(), causeRef)) {
166160
return true;

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,6 @@ public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
155155
return false;
156156
}
157157
JavaType javaType = getJavaType(type, contextClass);
158-
if (!logger.isWarnEnabled()) {
159-
return this.objectMapper.canDeserialize(javaType);
160-
}
161158
AtomicReference<Throwable> causeRef = new AtomicReference<Throwable>();
162159
if (this.objectMapper.canDeserialize(javaType, causeRef)) {
163160
return true;
@@ -171,9 +168,6 @@ public boolean canWrite(Class<?> clazz, MediaType mediaType) {
171168
if (!canWrite(mediaType)) {
172169
return false;
173170
}
174-
if (!logger.isWarnEnabled()) {
175-
return this.objectMapper.canSerialize(clazz);
176-
}
177171
AtomicReference<Throwable> causeRef = new AtomicReference<Throwable>();
178172
if (this.objectMapper.canSerialize(clazz, causeRef)) {
179173
return true;

0 commit comments

Comments
 (0)