From 7be842be05f5ec32f96b3fafd2515a05ba29fa65 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Sat, 18 Jul 2009 07:38:39 +0000 Subject: [PATCH] * MessageEvent.getRemoteAddress() does not return null anymore * Improved the String representation of MessageEvent implementations --- .../jboss/netty/channel/DownstreamMessageEvent.java | 2 +- .../jboss/netty/channel/UpstreamMessageEvent.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jboss/netty/channel/DownstreamMessageEvent.java b/src/main/java/org/jboss/netty/channel/DownstreamMessageEvent.java index 9a644f5124..ac63b6f183 100644 --- a/src/main/java/org/jboss/netty/channel/DownstreamMessageEvent.java +++ b/src/main/java/org/jboss/netty/channel/DownstreamMessageEvent.java @@ -87,7 +87,7 @@ public class DownstreamMessageEvent implements MessageEvent { StringUtil.stripControlCharacters(getMessage()); } else { return getChannel().toString() + " WRITE: " + - StringUtil.stripControlCharacters(getMessage()) + ", " + + StringUtil.stripControlCharacters(getMessage()) + " to " + getRemoteAddress(); } } diff --git a/src/main/java/org/jboss/netty/channel/UpstreamMessageEvent.java b/src/main/java/org/jboss/netty/channel/UpstreamMessageEvent.java index 5983441c03..6fbaeedeef 100644 --- a/src/main/java/org/jboss/netty/channel/UpstreamMessageEvent.java +++ b/src/main/java/org/jboss/netty/channel/UpstreamMessageEvent.java @@ -57,7 +57,12 @@ public class UpstreamMessageEvent implements MessageEvent { } this.channel = channel; this.message = message; - this.remoteAddress = remoteAddress; + + if (remoteAddress != null) { + this.remoteAddress = remoteAddress; + } else { + this.remoteAddress = channel.getRemoteAddress(); + } } public Channel getChannel() { @@ -78,12 +83,13 @@ public class UpstreamMessageEvent implements MessageEvent { @Override public String toString() { - if (getRemoteAddress() == null) { + // It's safe to use identity comparison in this case. + if (getRemoteAddress() == getChannel().getRemoteAddress()) { return getChannel().toString() + " RECEIVED: " + StringUtil.stripControlCharacters(getMessage()); } else { return getChannel().toString() + " RECEIVED: " + - StringUtil.stripControlCharacters(getMessage()) + ", " + + StringUtil.stripControlCharacters(getMessage()) + " from " + getRemoteAddress(); } }