Skip to content
This repository has been archived by the owner on Sep 26, 2023. It is now read-only.

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion gax/src/main/java/com/google/api/gax/rpc/Watchdog.java
Expand Up @@ -151,7 +151,6 @@ public boolean isTerminated() {
@Override
public void shutdownNow() {
future.cancel(true);
executor.shutdownNow();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java
Expand Up @@ -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> {
Expand Down