From 4e933b476543990f967bb6f1314264b323775705 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 17 Jan 2014 10:55:55 -0500 Subject: [PATCH] Polish log messages --- .../simp/stomp/StompHeaderAccessor.java | 2 +- .../support/AbstractSubscribableChannel.java | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java index ea81e06695..5b1d1d0e94 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java @@ -195,7 +195,7 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor { result.put(name, Arrays.asList(subscriptionId)); } else { - logger.warn(getCommand() + " frame should have a subscription: " + this.toString()); + logger.warn(getCommand() + " frame does not have a subscription identifier" + this.toString()); } } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/AbstractSubscribableChannel.java b/spring-messaging/src/main/java/org/springframework/messaging/support/AbstractSubscribableChannel.java index ac0b440647..6faed3af0d 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/AbstractSubscribableChannel.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/AbstractSubscribableChannel.java @@ -29,22 +29,24 @@ public abstract class AbstractSubscribableChannel extends AbstractMessageChannel @Override public final boolean subscribe(MessageHandler handler) { - if (hasSubscription(handler)) { - logger.warn("[" + getBeanName() + "] handler already subscribed " + handler); - return false; + boolean result = subscribeInternal(handler); + if (result) { + if (logger.isDebugEnabled()) { + logger.debug("[" + getBeanName() + "] subscribed " + handler); + } } - if (logger.isDebugEnabled()) { - logger.debug("[" + getBeanName() + "] subscribing " + handler); - } - return subscribeInternal(handler); + return result; } @Override public final boolean unsubscribe(MessageHandler handler) { - if (logger.isDebugEnabled()) { - logger.debug("[" + getBeanName() + "] unsubscribing " + handler); + boolean result = unsubscribeInternal(handler); + if (result) { + if (logger.isDebugEnabled()) { + logger.debug("[" + getBeanName() + "] unsubscribed " + handler); + } } - return unsubscribeInternal(handler); + return result; }