Skip to content
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.

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

Don't reference ThreadDeath directly due to its future removal #2878

Merged
merged 1 commit into from
Oct 3, 2024
Merged
Changes from all commits
Commits
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
19 changes: 18 additions & 1 deletion vavr/src/main/java/io/vavr/control/Try.java
Original file line number Diff line number Diff line change
Expand Up @@ -1696,7 +1696,7 @@ interface TryModule {
static boolean isFatal(Throwable throwable) {
return throwable instanceof InterruptedException
|| throwable instanceof LinkageError
|| throwable instanceof ThreadDeath
|| ThreadDeathResolver.isThreadDeath(throwable)
|| throwable instanceof VirtualMachineError;
}

Expand All @@ -1706,4 +1706,21 @@ static <T extends Throwable, R> R sneakyThrow(Throwable t) throws T {
throw (T) t;
}

static class ThreadDeathResolver {
static final Class<?> THREAD_DEATH_CLASS = resolve();

static boolean isThreadDeath(Throwable throwable) {
return THREAD_DEATH_CLASS != null && THREAD_DEATH_CLASS.isInstance(throwable);
}

private static Class<?> resolve() {
try {
return Class.forName("java.lang.ThreadDeath");
} catch (ClassNotFoundException e) {
return null;
}
}
}
}


Loading