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

Commit

Permalink
fix: Watchdog.shutdownNow() does not shutdown executor (#1158)
Browse files Browse the repository at this point in the history
Co-authored-by: Radek Grebski <radoslaw.grebski@stepwise.pl>
  • Loading branch information
rgrebski and Radek Grebski committed Aug 6, 2020
1 parent 2c56c79 commit 6241a21
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion gax/src/main/java/com/google/api/gax/rpc/Watchdog.java
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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

0 comments on commit 6241a21

Please sign in to comment.