fix: Watchdog.shutdownNow() does not shutdown executor (#1158)

Co-authored-by: Radek Grebski <radoslaw.grebski@stepwise.pl>
googleapis · Aug 6, 2020 · 6241a21 · 6241a21
1 parent 2c56c79
commit 6241a21
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 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
@@ -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
@@ -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> {