From 6241a2118690d07dd28ffb9447423363f3f914e4 Mon Sep 17 00:00:00 2001
From: Radek Grebski <rgrebski@gmail.com>
Date: Thu, 6 Aug 2020 22:32:42 +0200
Subject: [PATCH] fix: Watchdog.shutdownNow() does not shutdown executor
 (#1158)

Co-authored-by: Radek Grebski <radoslaw.grebski@stepwise.pl>
---
 gax/src/main/java/com/google/api/gax/rpc/Watchdog.java     | 1 -
 gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java
index b71dfe256..a8cea4f6e 100644
--- a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java
+++ b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java
@@ -151,7 +151,6 @@ public boolean isTerminated() {
   @Override
   public void shutdownNow() {
     future.cancel(true);
-    executor.shutdownNow();
   }
 
   @Override
diff --git a/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java b/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java
index 65fa5f205..c41abebdb 100644
--- a/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java
+++ b/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java
@@ -191,7 +191,7 @@ public void testWatchdogBeingClosed() {
 
     underTest.shutdownNow();
     Mockito.verify(future).cancel(true);
-    Mockito.verify(mockExecutor).shutdownNow();
+    Mockito.verifyNoMoreInteractions(mockExecutor);
   }
 
   static class AccumulatingObserver<T> implements ResponseObserver<T> {