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 implements ResponseObserver {