fix: do not shut down executor when WatchDog is shut down (#871)

Fixes #870
googleapis · Feb 18, 2020 · 327cd8d · 327cd8d
1 parent ee90c2c
commit 327cd8d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions 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
@@ -124,7 +124,6 @@ public void run() {
   @Override
   public void shutdown() {
     future.cancel(false);
-    executor.shutdown();
   }
 
   @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
@@ -188,7 +188,6 @@ public void testWatchdogBeingClosed() {
         .scheduleAtFixedRate(
             underTest, checkInterval.toMillis(), checkInterval.toMillis(), TimeUnit.MILLISECONDS);
     Mockito.verify(future, Mockito.times(2)).cancel(false);
-    Mockito.verify(mockExecutor, Mockito.times(2)).shutdown();
 
     underTest.shutdownNow();
     Mockito.verify(future).cancel(true);