Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 068cdf2

Browse files
committed
fix
1 parent cce0540 commit 068cdf2

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableChannelPrimer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
import io.grpc.Channel;
3030
import io.grpc.ClientCall;
3131
import io.grpc.Deadline;
32-
import io.grpc.ManagedChannel;
3332
import io.grpc.Metadata;
3433
import io.grpc.Status;
3534
import io.grpc.auth.MoreCallCredentials;
35+
3636
import java.io.IOException;
3737
import java.io.UnsupportedEncodingException;
3838
import java.net.URLEncoder;

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/grpc/BigtableTransportChannelProvider.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,12 @@ public TransportChannel getTransportChannel() throws IOException {
206206
selectedProvider = (InstantiatingGrpcChannelProvider) delegate.withHeaders(fallbackHeaders);
207207
}
208208

209+
210+
if (maybeDirectAccessChannel instanceof ManagedChannel) {
211+
// call shutdown
212+
((ManagedChannel) maybeDirectAccessChannel).shutdownNow();
213+
}
214+
209215
// This provider's main purpose is to replace the default GAX ChannelPool
210216
// with a custom BigtableChannelPool, reusing the delegate's configuration.
211217

@@ -259,7 +265,7 @@ public TransportChannelProvider withCredentials(Credentials credentials) {
259265
InstantiatingGrpcChannelProvider newChannelProvider =
260266
(InstantiatingGrpcChannelProvider) delegate.withCredentials(credentials);
261267
return new BigtableTransportChannelProvider(
262-
newChannelProvider, channelPrimer, channelPoolMetricsTracer, backgroundExecutor, );
268+
newChannelProvider, channelPrimer, channelPoolMetricsTracer, backgroundExecutor, headers);
263269
}
264270

265271
/** Creates a BigtableTransportChannelProvider. */

0 commit comments

Comments
 (0)