홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
041515f5 1 parent 33bd2302

temporary fix for ONOS-1144: slow IPAddress.toString() 

Change-Id: Ia7b9a71bb8c5b90dbc6256c35e8aa5a6567299c8
Inline Side-by-side
Showing 1 changed file with 18 additions and 8 deletions
......@@ -331,15 +331,25 @@ public class IpAddress implements Comparable<IpAddress> {
* @see java.lang.Object#toString()
*/
public String toString() {
InetAddress inetAddr = null;
try {
inetAddr = InetAddress.getByAddress(octets);
} catch (UnknownHostException e) {
// Should never happen
checkState(false, "Internal error: Ip6Address.toString()");
return "[Invalid IP Address]";
// FIXME InetAddress is super slow
switch (version) {
case INET:
return String.format("%d.%d.%d.%d", octets[0] & 0xff,
octets[1] & 0xff,
octets[2] & 0xff,
octets[3] & 0xff);
case INET6:
default:
InetAddress inetAddr = null;
try {
inetAddr = InetAddress.getByAddress(octets);
} catch (UnknownHostException e) {
// Should never happen
checkState(false, "Internal error: Ip6Address.toString()");
return "[Invalid IP Address]";
}
return InetAddresses.toAddrString(inetAddr);
}
return InetAddresses.toAddrString(inetAddr);
}
/**
......