Merge pull request #41 from tajila/origin

Remove unnecessary interrupt call
ibmruntimes · Oct 21, 2022 · 4ab9a18 · 4ab9a18
2 parents 5d5a547 + 50e3c90
commit 4ab9a18
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
@@ -1750,22 +1750,20 @@ public final void stop() {
      * @revised 6.0, 14
      */
     public void interrupt() {
-        if (this != Thread.currentThread()) {
+        if (currentThread() != this) {
             checkAccess();
+        }
+
+        synchronized (interruptLock) {
+            interrupt0();  // inform VM of interrupt
+            interrupted = true;
 
             // thread may be blocked in an I/O operation
-            synchronized (interruptLock) {
-                Interruptible b = nioBlocker;
-                if (b != null) {
-                    interrupted = true;
-                    interrupt0();  // inform VM of interrupt
-                    b.interrupt(this);
-                    return;
-                }
+            Interruptible b = nioBlocker;
+            if (b != null) {
+                b.interrupt(this);
             }
         }
-        interrupted = true;
-        interrupt0();  // inform VM of interrupt
     }
 
     /**