archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8225499: InetSocketAddress::toString not friendly to IPv6 literal addresses

Browse source 
Enclose IPv6 literal in brackets and adjust string format for unresolved addresses

Reviewed-by: dfuchs, chegar
This commit is contained in:
Julia Boes 2019-10-17 08:56:06 +01:00
parent 2c573582ab
commit f8440c33d2
2 changed files with 141 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/java.base/share/classes/java/net/InetSocketAddress.java
View file

@ -101,11 +101,20 @@ public class InetSocketAddress
@Override
public String toString() {
String formatted;
if (isUnresolved()) {
return hostname + ":" + port;
formatted = hostname + "/<unresolved>";
} else {
return addr.toString() + ":" + port;
formatted = addr.toString();
if (addr instanceof Inet6Address) {
int i = formatted.lastIndexOf("/");
formatted = formatted.substring(0, i + 1)
+ "[" + formatted.substring(i + 1) + "]";
}
}
return formatted + ":" + port;
}
@Override
@ -367,7 +376,9 @@ public class InetSocketAddress
* Constructs a string representation of this InetSocketAddress.
* This String is constructed by calling toString() on the InetAddress
* and concatenating the port number (with a colon). If the address
* is unresolved then the part before the colon will only contain the hostname.
* is an IPv6 address, the IPv6 literal is enclosed in square brackets.
* If the address is {@linkplain #isUnresolved() unresolved},
* {@code <unresolved>} is displayed in place of the address literal.
*
* @return a string representation of this object.
*/