diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java index 364ecbb65..b45fcadc5 100644 --- a/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java +++ b/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java @@ -66,7 +66,7 @@ public final class InstantiatingGrpcChannelProvider implements TransportChannelP private final ExecutorProvider executorProvider; private final HeaderProvider headerProvider; private final String endpoint; - private final boolean skipNegotiation; + @Nullable private final Boolean skipNegotiation; @Nullable private final Integer maxInboundMessageSize; @Nullable private final Duration keepAliveTime; @Nullable private final Duration keepAliveTimeout; @@ -170,9 +170,11 @@ private ManagedChannel createSingleChannel() throws IOException { ManagedChannelBuilder.forAddress(serviceAddress, port) .intercept(headerInterceptor) .userAgent(headerInterceptor.getUserAgentHeader()) - .executor(executor) - .usePlaintext(skipNegotiation); + .executor(executor); + if (skipNegotiation != null) { + builder.usePlaintext(skipNegotiation); + } if (maxInboundMessageSize != null) { builder.maxInboundMessageSize(maxInboundMessageSize); } @@ -227,7 +229,7 @@ public static final class Builder { private ExecutorProvider executorProvider; private HeaderProvider headerProvider; private String endpoint; - private boolean skipNegotiation; + @Nullable private Boolean skipNegotiation; @Nullable private Integer maxInboundMessageSize; @Nullable private Duration keepAliveTime; @Nullable private Duration keepAliveTimeout;