root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polish log messages

This commit is contained in:
Rossen Stoyanchev 2014-01-17 10:55:55 -05:00
parent 6e30851328
commit 4e933b4765
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
View File

@ -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());
}
}

22
spring-messaging/src/main/java/org/springframework/messaging/support/AbstractSubscribableChannel.java
View File

@ -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;
}