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

rgrebski · Radek Grebski · web-flow · commit 6241a2118690 · 2020-08-06T13:32:42.000-07:00
Co-authored-by: Radek Grebski &lt;radoslaw.grebski@stepwise.pl&gt;
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> {

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,6 @@ public boolean isTerminated() {`
`151`	`151`	`@Override`
`152`	`152`	`public void shutdownNow() {`
`153`	`153`	`future.cancel(true);`
`154`		`- executor.shutdownNow();`
`155`	`154`	`}`
`156`	`155`
`157`	`156`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public void testWatchdogBeingClosed() {`
`191`	`191`
`192`	`192`	`underTest.shutdownNow();`
`193`	`193`	`Mockito.verify(future).cancel(true);`
`194`		`- Mockito.verify(mockExecutor).shutdownNow();`
	`194`	`+ Mockito.verifyNoMoreInteractions(mockExecutor);`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`static class AccumulatingObserver<T> implements ResponseObserver<T> {`