From 4fdb8244ae0abd95f5e394c8a7c4cb4f3b5391ed Mon Sep 17 00:00:00 2001 From: Mattias Rehnberg Date: Thu, 18 Nov 2004 17:11:40 +0100 Subject: Inet6Address.java (getHostAddress): Fix textual representation of IPv6 address with embedded zeroes to conform to... 2004-11-18 Mattias Rehnberg * java/net/Inet6Address.java (getHostAddress): Fix textual representation of IPv6 address with embedded zeroes to conform to RFC 2373. From-SVN: r90874 --- libjava/java/net/Inet6Address.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/net/Inet6Address.java b/libjava/java/net/Inet6Address.java index e0329d5..0c1d60e 100644 --- a/libjava/java/net/Inet6Address.java +++ b/libjava/java/net/Inet6Address.java @@ -207,18 +207,11 @@ public final class Inet6Address extends InetAddress for (int i = 0; i < 16; i += 2) { int x = ((ipaddress[i] & 0xFF) << 8) | (ipaddress[i + 1] & 0xFF); - boolean empty = sbuf.length() == 0; - - if (empty) - { - if (i > 0) - sbuf.append("::"); - } - else + + if (i > 0) sbuf.append(':'); - if (x != 0 || i >= 14) - sbuf.append(Integer.toHexString(x)); + sbuf.append(Integer.toHexString(x)); } return sbuf.toString(); -- cgit v1.1