archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8323782: Race: Thread::interrupt vs. AbstractInterruptibleChannel.begin

Browse source 
Co-authored-by: Alan Bateman <alanb@openjdk.org>
Reviewed-by: alanb, dholmes
This commit is contained in:
Richard Reingruber 2024-02-16 08:40:13 +00:00
parent 2705ed0a71
commit 4018b2b196
2 changed files with 98 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/java.base/share/classes/java/lang/Thread.java
View file

@ -1702,24 +1702,25 @@ public class Thread implements Runnable {
public void interrupt() {
if (this != Thread.currentThread()) {
checkAccess();
}
// thread may be blocked in an I/O operation
// Setting the interrupt status must be done before reading nioBlocker.
interrupted = true;
interrupt0(); // inform VM of interrupt
// thread may be blocked in an I/O operation
if (this != Thread.currentThread()) {
Interruptible blocker;
synchronized (interruptLock) {
blocker = nioBlocker;
if (blocker != null) {
interrupted = true;
interrupt0(); // inform VM of interrupt
blocker.interrupt(this);
}
}
if (blocker != null) {
blocker.postInterrupt();
return;
}
}
interrupted = true;
interrupt0(); // inform VM of interrupt
}
/**