andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Java 6 compatibility issue in DnsNameResolver

Browse Source 
Related: #3173

Motivation:

DnsNameResolver was using InetSocketAddress.getHostString() which is
only available since Java 7.

Modifications:

Use InetSocketAddress.getHostName() in lieu of getHostString() when the
current Java version is less than 7.

Result:

DnsNameResolver runs fine on Java 6.
This commit is contained in:
Trustin Lee 2014-12-06 22:31:44 +09:00
parent 97bf8a6d61
commit 216cbd9e31
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java
View File

@ -642,7 +642,7 @@ public class DnsNameResolver extends SimpleNameResolver<InetSocketAddress> {
@Override @Override
protected void doResolve(InetSocketAddress unresolvedAddress, Promise<InetSocketAddress> promise) throws Exception { protected void doResolve(InetSocketAddress unresolvedAddress, Promise<InetSocketAddress> promise) throws Exception {
final String hostname = IDN.toASCII(unresolvedAddress.getHostString()); final String hostname = IDN.toASCII(hostname(unresolvedAddress));
final int port = unresolvedAddress.getPort(); final int port = unresolvedAddress.getPort();
final DnsNameResolverContext ctx = new DnsNameResolverContext(this, hostname, port, promise); final DnsNameResolverContext ctx = new DnsNameResolverContext(this, hostname, port, promise);
@ -650,6 +650,15 @@ public class DnsNameResolver extends SimpleNameResolver<InetSocketAddress> {
ctx.resolve(); ctx.resolve();
} }
private static String hostname(InetSocketAddress addr) {
// InetSocketAddress.getHostString() is available since Java 7.
if (PlatformDependent.javaVersion() < 7) {
return addr.getHostName();
} else {
return addr.getHostString();
}
}
/** /**
* Sends a DNS query with the specified question. * Sends a DNS query with the specified question.
*/ */