commit 726c23b7dadd52e5ce0047874a1366b40f3dd0f5
author zpencer <spencerfang@google.com> Fri Jun 16 18:54:47 2017 -0700
committer GitHub <noreply@github.com> Fri Jun 16 18:54:47 2017 -0700
tree 10932719742467ce48d50792441c402151ee057e
parent d6d3a53d2543ebcbdccfa71e15d24335a57d4084

core: OverrideAuthorityNameResolverFactory should forward refresh() (#3061)

The current implementation has a bug where certain methods are not forwarded to the delegate.

This is essentially the same as e4f1f39 which was merged to the v1.4.x branch. This PR uses the new license header.

Fixes #3061

core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java

diff --git a/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java b/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java
index 386d95c..29ce532 100644
--- a/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java
+++ b/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java
@@ -93,6 +93,9 @@
 
   private final List<ClientInterceptor> interceptors = new ArrayList<ClientInterceptor>();
 
+  // Access via getter, which may perform authority override as needed
+  private NameResolver.Factory nameResolverFactory = DEFAULT_NAME_RESOLVER_FACTORY;
+
   final String target;
 
   @Nullable
@@ -101,10 +104,10 @@
   @Nullable
   String userAgent;
 
+  @VisibleForTesting
   @Nullable
   String authorityOverride;
 
-  NameResolver.Factory nameResolverFactory = DEFAULT_NAME_RESOLVER_FACTORY;
 
   LoadBalancer.Factory loadBalancerFactory = DEFAULT_LOAD_BALANCER_FACTORY;
 
@@ -367,6 +370,17 @@
     return Attributes.EMPTY;
   }
 
+  /**
+   * Returns a {@link NameResolver.Factory} for the channel.
+   */
+  NameResolver.Factory getNameResolverFactory() {
+    if (authorityOverride == null) {
+      return nameResolverFactory;
+    } else {
+      return new OverrideAuthorityNameResolverFactory(nameResolverFactory, authorityOverride);
+    }
+  }
+
   private static class DirectAddressNameResolverFactory extends NameResolver.Factory {
     final SocketAddress address;
     final String authority;