commit

Author: kannanjgithub

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

@@ -360,10 +360,6 @@ public ManagedChannelImplBuilder(SocketAddress directServerAddress, String autho
     InternalConfiguratorRegistry.configureChannelBuilder(this);
   }
 
-  public ChannelCredentials getChannelCredentials() {
-    return channelCredentials;
-  }
-
   @Override
   public ManagedChannelImplBuilder directExecutor() {
     return executor(MoreExecutors.directExecutor());

okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java

@@ -92,6 +92,7 @@ public final class OkHttpChannelBuilder extends ForwardingChannelBuilder2<OkHttp
   public static final int DEFAULT_FLOW_CONTROL_WINDOW = 65535;
 
   private final ManagedChannelImplBuilder managedChannelImplBuilder;
+  private final ChannelCredentials channelCrentials;
   private TransportTracer.Factory transportTracerFactory = TransportTracer.getDefaultFactory();
 
 
@@ -221,6 +222,7 @@ private OkHttpChannelBuilder(String target) {
     this.sslSocketFactory = factory;
     this.negotiationType = factory == null ? NegotiationType.PLAINTEXT : NegotiationType.TLS;
     this.freezeSecurityConfiguration = true;
+    this.channelCrentials = channelCreds;
   }
 
   private final class OkHttpChannelTransportFactoryBuilder
@@ -538,7 +540,7 @@ OkHttpTransportFactory buildTransportFactory() {
         maxInboundMetadataSize,
         transportTracerFactory,
         useGetForSafeMethods,
-        managedChannelImplBuilder.getChannelCredentials());
+        channelCredentials);
   }
 
   OkHttpChannelBuilder disableCheckAuthority() {