From 97df6cf55ab66552612bf0a2eefb83c0783fd586 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Fri, 9 Jun 2023 07:30:03 +0000
Subject: [PATCH] 8309545: Thread.interrupted from virtual thread needlessly
 resets interrupt status

Reviewed-by: rpressler, dholmes, jpai
---
 .../share/classes/java/lang/VirtualThread.java        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index 746f93cdfac05..b79c3ba72b4eb 100644
--- 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