Skip to content

TestThread: Try interrupt() before stop() in tearDown() #8169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nickita-khylkouski wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −4
Open

TestThread: Try interrupt() before stop() in tearDown() #8169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4268932
TestThread: Try interrupt() before stop() in tearDown()
nickita-khylkouski Jan 26, 2026
722988a
chore: trigger CI
nickita-khylkouski Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions guava-tests/test/com/google/common/util/concurrent/TestThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,27 @@ public TestThread(L lockLikeObject, String threadName) {
*/
@Override
public void tearDown() throws Exception {
// First, try to interrupt the thread. This allows interruptible threads (like those in
// InterruptibleMonitorTest) to clean up gracefully. For uninterruptible threads, this
// will have no effect, but we try stop() next as a fallback for older JDKs.
interrupt();
try {
Thread.class.getMethod("stop").invoke(this);
join();
} catch (ReflectiveOperationException e) {
// stop() threw or did not exist. Don't join() the thread, which might hang forever.
// Give the thread a chance to respond to the interrupt before trying stop().
join(DUE_DILIGENCE_MILLIS);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}

if (isAlive()) {
// Thread didn't respond to interrupt. Try stop() for older JDKs (pre-Java 20).
// On Java 20+, stop() throws UnsupportedOperationException, so the thread will
// remain alive. This is unavoidable for uninterruptible threads.
try {
Thread.class.getMethod("stop").invoke(this);
join();
} catch (ReflectiveOperationException e) {
// stop() threw or did not exist. Don't join() the thread, which might hang forever.
}
}

if (uncaughtThrowable != null) {
Expand Down