Skip to content

Commit

Permalink
Fix default proxy resolver
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephane Maldini committed Feb 27, 2017
1 parent 3f7e9ff commit bd7bcf8
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/main/java/reactor/ipc/netty/options/ClientOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.resolver.AddressResolverGroup;
import io.netty.resolver.DefaultAddressResolverGroup;
import io.netty.resolver.NoopAddressResolverGroup;
import io.netty.util.NetUtil;
import reactor.core.Exceptions;
Expand Down Expand Up @@ -361,7 +362,7 @@ public ClientOptions proxy(@Nonnull Proxy type,
this.proxyPassword = password;
this.proxyAddress = Objects.requireNonNull(connectAddress, "addressSupplier");
this.proxyType = Objects.requireNonNull(type, "proxyType");
if(bootstrapTemplate.config().resolver() == null){
if(bootstrapTemplate.config().resolver() == DefaultAddressResolverGroup.INSTANCE){
resolver(NoopAddressResolverGroup.INSTANCE);
}
return this;
Expand Down

0 comments on commit bd7bcf8

Please sign in to comment.