diff --git a/transport/src/main/java/io/netty/bootstrap/Bootstrap.java b/transport/src/main/java/io/netty/bootstrap/Bootstrap.java index ba93abe81e..fa52dea270 100644 --- a/transport/src/main/java/io/netty/bootstrap/Bootstrap.java +++ b/transport/src/main/java/io/netty/bootstrap/Bootstrap.java @@ -70,13 +70,15 @@ public class Bootstrap extends AbstractBootstrap { /** * Sets the {@link NameResolver} which will resolve the address of the unresolved named address. + * + * @param resolver the {@link NameResolver} for this {@code Bootstrap}; may be {@code null}, in which case a default + * resolver will be used + * + * @see io.netty.resolver.DefaultAddressResolverGroup */ @SuppressWarnings("unchecked") public Bootstrap resolver(AddressResolverGroup resolver) { - if (resolver == null) { - throw new NullPointerException("resolver"); - } - this.resolver = (AddressResolverGroup) resolver; + this.resolver = (AddressResolverGroup) (resolver == null ? DEFAULT_RESOLVER : resolver); return this; }