diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java index 9e368c0313..6e2d799e0e 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java @@ -195,6 +195,7 @@ public class DnsNameResolver extends InetNameResolver { * @param dnsServerAddressStreamProvider The {@link DnsServerAddressStreamProvider} used to determine the name * servers for each hostname lookup. * @param searchDomains the list of search domain + * (can be null, if so, will try to default to the underlying platform ones) * @param ndots the ndots value * @param decodeIdn {@code true} if domain / host names should be decoded to unicode when received. * See rfc3492. @@ -232,7 +233,7 @@ public class DnsNameResolver extends InetNameResolver { this.authoritativeDnsServerCache = checkNotNull(authoritativeDnsServerCache, "authoritativeDnsServerCache"); this.dnsQueryLifecycleObserverFactory = checkNotNull(dnsQueryLifecycleObserverFactory, "dnsQueryLifecycleObserverFactory"); - this.searchDomains = checkNotNull(searchDomains, "searchDomains").clone(); + this.searchDomains = searchDomains != null ? searchDomains.clone() : DEFAULT_SEARCH_DOMAINS; this.ndots = checkPositiveOrZero(ndots, "ndots"); this.decodeIdn = decodeIdn; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java index 649d40baed..497ba5b39b 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java @@ -54,7 +54,7 @@ public final class DnsNameResolverBuilder { private DnsServerAddressStreamProvider dnsServerAddressStreamProvider = platformDefault(); private DnsQueryLifecycleObserverFactory dnsQueryLifecycleObserverFactory = NoopDnsQueryLifecycleObserverFactory.INSTANCE; - private String[] searchDomains = DnsNameResolver.DEFAULT_SEARCH_DOMAINS; + private String[] searchDomains; private int ndots = 1; private boolean decodeIdn = true;