summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Hudson <nick.hudson@isode.com>2012-01-16 12:14:02 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-01-18 11:03:48 (GMT)
commit6665e38f97f95dd6e0fc574dc65a1be37b2b101f (patch)
treea780670c4a15abca042a0c75fa172b40b1808a22 /src/com/isode/stroke/network/HostAddress.java
parent839db071f46d083b86996f514f5fe0f2d6aee80a (diff)
downloadstroke-6665e38f97f95dd6e0fc574dc65a1be37b2b101f.zip
stroke-6665e38f97f95dd6e0fc574dc65a1be37b2b101f.tar.bz2
Add toString to some more classes
Also made "Stanza" be an abstract class and had its ".toString()" include the name of the subclass which is involved, so that the subclasses don't have to do that themselves. Also added null check to existing HostAddress.toString() method Also fixed Remko copyright in Connector class Test-information: Stuff is displayed as expected in debugger.
Diffstat (limited to 'src/com/isode/stroke/network/HostAddress.java')
-rw-r--r--src/com/isode/stroke/network/HostAddress.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/isode/stroke/network/HostAddress.java b/src/com/isode/stroke/network/HostAddress.java
index 94ae1f7..7145fb3 100644
--- a/src/com/isode/stroke/network/HostAddress.java
+++ b/src/com/isode/stroke/network/HostAddress.java
@@ -26,6 +26,11 @@ public class HostAddress {
@Override
public String toString() {
+ // toString() should always be callable without risking
+ // NullPointerException
+ if (address_ == null) {
+ return "<no address>";
+ }
return address_.getHostAddress();
}
@@ -51,6 +56,6 @@ public class HostAddress {
InetAddress getInetAddress() {
return address_;
}
-
+
private final InetAddress address_;
}