From 122ee3096c3c83023af3a4c8d023dcdd04c4a2f8 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 10 Jul 2017 20:44:51 +0200 Subject: [PATCH] Efficient log checks in STOMP encoder/decoder --- .../messaging/simp/stomp/StompDecoder.java | 8 ++++---- .../messaging/simp/stomp/StompEncoder.java | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java index 961b3ca27e5..7cbc7ff324a 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java @@ -160,9 +160,7 @@ public class StompDecoder { } } else { - if (logger.isTraceEnabled()) { - logger.trace("Incomplete frame, resetting input buffer..."); - } + logger.trace("Incomplete frame, resetting input buffer..."); if (headers != null && headerAccessor != null) { String name = NativeMessageHeaderAccessor.NATIVE_HEADERS; @SuppressWarnings("unchecked") @@ -299,7 +297,9 @@ public class StompDecoder { contentLength = headerAccessor.getContentLength(); } catch (NumberFormatException ex) { - logger.warn("Ignoring invalid content-length: '" + headerAccessor); + if (logger.isWarnEnabled()) { + logger.warn("Ignoring invalid content-length: '" + headerAccessor); + } contentLength = null; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java index 851f210629d..66700793065 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java @@ -98,9 +98,7 @@ public class StompEncoder { DataOutputStream output = new DataOutputStream(baos); if (SimpMessageType.HEARTBEAT.equals(SimpMessageHeaderAccessor.getMessageType(headers))) { - if (logger.isTraceEnabled()) { - logger.trace("Encoding heartbeat"); - } + logger.trace("Encoding heartbeat"); output.write(StompDecoder.HEARTBEAT_PAYLOAD); }