From 121a3bf6700cfc968d40ebdd018d6ba29b86aa03 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 12 Jul 2017 19:13:03 +0200 Subject: [PATCH] Always invoke Jackson serialization with AtomicReference cause Issue: SPR-15760 (cherry picked from commit 5f767a8) --- .../converter/MappingJackson2MessageConverter.java | 6 ------ .../json/AbstractJackson2HttpMessageConverter.java | 6 ------ 2 files changed, 12 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java index 6921c2dab7f..76c4362cca9 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java @@ -142,9 +142,6 @@ public class MappingJackson2MessageConverter extends AbstractMessageConverter { return false; } JavaType javaType = this.objectMapper.constructType(targetClass); - if (!logger.isWarnEnabled()) { - return this.objectMapper.canDeserialize(javaType); - } AtomicReference causeRef = new AtomicReference(); if (this.objectMapper.canDeserialize(javaType, causeRef)) { return true; @@ -158,9 +155,6 @@ public class MappingJackson2MessageConverter extends AbstractMessageConverter { if (payload == null || !supportsMimeType(headers)) { return false; } - if (!logger.isWarnEnabled()) { - return this.objectMapper.canSerialize(payload.getClass()); - } AtomicReference causeRef = new AtomicReference(); if (this.objectMapper.canSerialize(payload.getClass(), causeRef)) { return true; 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 942985dcc53..08e39d994b7 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 @@ -155,9 +155,6 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener return false; } JavaType javaType = getJavaType(type, contextClass); - if (!logger.isWarnEnabled()) { - return this.objectMapper.canDeserialize(javaType); - } AtomicReference causeRef = new AtomicReference(); if (this.objectMapper.canDeserialize(javaType, causeRef)) { return true; @@ -171,9 +168,6 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener if (!canWrite(mediaType)) { return false; } - if (!logger.isWarnEnabled()) { - return this.objectMapper.canSerialize(clazz); - } AtomicReference causeRef = new AtomicReference(); if (this.objectMapper.canSerialize(clazz, causeRef)) { return true;