Merge pull request #11 from ThanHenderson/19304

Add synchronization when setting interrupted field in Thread::interrupt
ibmruntimes · Jul 11, 2024 · 446f0bd · 446f0bd
2 parents 8b9d0dd + 8d0fff0
commit 446f0bd
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
@@ -1724,8 +1724,10 @@ public void interrupt() {
         }
 
         // Setting the interrupt status must be done before reading nioBlocker.
-        interrupted = true;
-        interrupt0();  // inform VM of interrupt
+        synchronized (interruptLock) {
+            interrupted = true;
+            interrupt0();  // inform VM of interrupt
+        }
 
         // thread may be blocked in an I/O operation
         if (this != Thread.currentThread()) {