From d076e4332ee005c6c76a9aa276a8e3f073922bc3 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Wed, 28 Apr 2021 21:24:49 +0000 Subject: [PATCH] update --- gax/src/main/java/com/google/api/gax/rpc/ClientContext.java | 2 +- gax/src/main/java/com/google/api/gax/rpc/StubSettings.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java b/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java index aaf6b1e60..f986f16b9 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java @@ -141,7 +141,7 @@ public static ClientContext create(StubSettings settings) throws IOException { ExecutorProvider workerExecutorProvider = settings.getWorkerExecutorProvider(); final ScheduledExecutorService workerExecutor = workerExecutorProvider.getExecutor(); - ScheduledExecutorService executor = + final ScheduledExecutorService executor = settings.getExecutorProvider() == null ? null : settings.getExecutorProvider().getExecutor(); diff --git a/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java b/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java index 0c50cef17..c2076c4f9 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java +++ b/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java @@ -93,6 +93,7 @@ protected StubSettings(Builder builder) { this.tracerFactory = builder.tracerFactory; } + /** @deprecated Please use {@link #getWorkerExecutorProvider()}. */ @Deprecated public final ExecutorProvider getExecutorProvider() { return executorProvider;