Code polish

This commit is contained in:
nathan 2018-01-11 14:51:11 +01:00
parent 9970e452e2
commit d9c2bcc3e2

View File

@ -375,12 +375,12 @@ class DnsNameResolver extends InetNameResolver {
} }
final byte[] bytes = NetUtil.createByteArrayFromIpAddressString(inetHost); final byte[] bytes = NetUtil.createByteArrayFromIpAddressString(inetHost);
if (bytes != null) { if (bytes != null) {
// The unresolvedAddress was created via a String that contains an ipaddress. // The unresolvedAddress was created via a String that contains an ip address.
promise.setSuccess(Collections.singletonList(InetAddress.getByAddress(bytes))); promise.setSuccess(Collections.singletonList(InetAddress.getByAddress(bytes)));
return; return;
} }
final String hostname = DnsQuestion.hostname(inetHost); final String hostname = DnsQuestion.hostNameAsciiFix(inetHost);
InetAddress hostsFileEntry = resolveHostsFileEntry(hostname); InetAddress hostsFileEntry = resolveHostsFileEntry(hostname);
if (hostsFileEntry != null) { if (hostsFileEntry != null) {
@ -443,10 +443,10 @@ class DnsNameResolver extends InetNameResolver {
private private
void doResolveAllUncached(String hostname, Promise<List<InetAddress>> promise, DnsCache resolveCache) { void doResolveAllUncached(String hostname, Promise<List<InetAddress>> promise, DnsCache resolveCache) {
new DnsNameResolverListResolverContext(this, DnsServerAddressStream nameServerAddrs = dnsServerAddressStreamProvider.nameServerAddressStream(hostname);
hostname,
resolveCache, DnsNameResolverListResolverContext context = new DnsNameResolverListResolverContext(this, hostname, resolveCache, nameServerAddrs);
dnsServerAddressStreamProvider.nameServerAddressStream(hostname)).resolve(promise); context.resolve(promise);
} }
/** /**
@ -468,7 +468,7 @@ class DnsNameResolver extends InetNameResolver {
return; return;
} }
final String hostname = DnsQuestion.hostname(inetHost); final String hostname = DnsQuestion.hostNameAsciiFix(inetHost);
InetAddress hostsFileEntry = resolveHostsFileEntry(hostname); InetAddress hostsFileEntry = resolveHostsFileEntry(hostname);
if (hostsFileEntry != null) { if (hostsFileEntry != null) {