From 99c40431b97d8138c3384ef444f801d0e3735035 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 10 Mar 2015 11:45:56 +0900 Subject: [PATCH] Use InetSocketAddress.getHostName() instead of getHostString() Related: #3478 Motivation: DefaultNameResolver uses InetSocketAddress.getHostString() instead of getHostName(). Because Netty uses the DefaultNameResolver by default and getHostString() is available only since Java 7, a user cannot use Netty on Java 6 anymore. Modifications: Use InetSocketAddress.getHostName() which is practically same and also is available in Java 6. Result: Netty 4.1 runs on Java 6 again. --- .../main/java/io/netty/resolver/DefaultNameResolver.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resolver/src/main/java/io/netty/resolver/DefaultNameResolver.java b/resolver/src/main/java/io/netty/resolver/DefaultNameResolver.java index bdfb3b7cb4..fde957c95c 100644 --- a/resolver/src/main/java/io/netty/resolver/DefaultNameResolver.java +++ b/resolver/src/main/java/io/netty/resolver/DefaultNameResolver.java @@ -41,10 +41,10 @@ public class DefaultNameResolver extends SimpleNameResolver { @Override protected void doResolve(InetSocketAddress unresolvedAddress, Promise promise) throws Exception { try { - promise.setSuccess( - new InetSocketAddress( - InetAddress.getByName(unresolvedAddress.getHostString()), - unresolvedAddress.getPort())); + // Note that InetSocketAddress.getHostName() will never incur a reverse lookup here, + // because an unresolved address always has a host name. + promise.setSuccess(new InetSocketAddress( + InetAddress.getByName(unresolvedAddress.getHostName()), unresolvedAddress.getPort())); } catch (UnknownHostException e) { promise.setFailure(e); }