8309545: Thread.interrupted from virtual thread needlessly resets int…

…errupt status Reviewed-by: rpressler, dholmes, jpai
openjdk · Jun 9, 2023 · 97df6cf · 97df6cf · openjdk-notifier · Jun 9, 2023
1 parent f91e9ba
commit 97df6cf
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -874,13 +874,14 @@ public boolean isInterrupted() {
     @Override
     boolean getAndClearInterrupt() {
         assert Thread.currentThread() == this;
-        synchronized (interruptLock) {
-            boolean oldValue = interrupted;
-            if (oldValue)
+        boolean oldValue = interrupted;
+        if (oldValue) {
+            synchronized (interruptLock) {
                 interrupted = false;
-            carrierThread.clearInterrupt();
-            return oldValue;
+                carrierThread.clearInterrupt();
+            }
         }
+        return oldValue;
     }
 
     @Override