Skip to content

Commit d30f365

Browse files
authored
---
yaml --- r: 28369 b: refs/heads/master c: 8d7b28f h: refs/heads/master i: 28367: f99d04e
1 parent baf3bff commit d30f365

4 files changed

Lines changed: 1781 additions & 4 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 32551b2fa80878e3a7a47f2b1f5fc784b69f2cdb
2+
refs/heads/master: 8d7b28f4ba1a80d67f511f11df9731d9a85e7cb7
33
refs/heads/gh-pages: 9b91392095cbb68bba1a32efe7d8caeac44467d9
44
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
55
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd

trunk/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.api.core.NanoClock;
2323
import com.google.api.gax.core.CredentialsProvider;
2424
import com.google.api.gax.core.GaxProperties;
25-
import com.google.api.gax.core.InstantiatingExecutorProvider;
2625
import com.google.api.gax.grpc.GaxGrpcProperties;
2726
import com.google.api.gax.grpc.GrpcCallContext;
2827
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
@@ -115,7 +114,6 @@
115114

116115
/** Implementation of Cloud Spanner remote calls using Gapic libraries. */
117116
public class GapicSpannerRpc implements SpannerRpc {
118-
119117
private static final PathTemplate PROJECT_NAME_TEMPLATE =
120118
PathTemplate.create("projects/{project}");
121119
private static final PathTemplate OPERATION_NAME_TEMPLATE =
@@ -190,7 +188,6 @@ public GapicSpannerRpc(SpannerOptions options) {
190188
options.getInterceptorProvider(),
191189
SpannerInterceptorProvider.createDefault()))
192190
.setHeaderProvider(mergedHeaderProvider)
193-
.setExecutorProvider(InstantiatingExecutorProvider.newBuilder().build())
194191
.build());
195192

196193
CredentialsProvider credentialsProvider =
@@ -582,6 +579,7 @@ private GrpcCallContext newCallContext(@Nullable Map<Option, ?> options, String
582579
return context.withStreamWaitTimeout(waitTimeout).withStreamIdleTimeout(idleTimeout);
583580
}
584581

582+
@Override
585583
public void shutdown() {
586584
this.spannerStub.close();
587585
this.instanceAdminStub.close();

0 commit comments

Comments
 (0)