From cee0ad80caadad333ed4ccb705eaa661d81927cb Mon Sep 17 00:00:00 2001 From: tajila Date: Wed, 30 Oct 2024 11:07:29 -0400 Subject: [PATCH] Merges Signed-off-by: tajila --- .../java.base/share/classes/java/lang/Thread.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/jcl/src/java.base/share/classes/java/lang/Thread.java b/jcl/src/java.base/share/classes/java/lang/Thread.java index c5802bfcb72..47b374c297c 100644 --- a/jcl/src/java.base/share/classes/java/lang/Thread.java +++ b/jcl/src/java.base/share/classes/java/lang/Thread.java @@ -746,15 +746,8 @@ public static boolean interrupted() { * @see Thread#start */ public final boolean isAlive() { -<<<<<<< HEAD /*[PR CMVC 88976] the Thread is alive until cleanup() is called */ return threadRef != NO_REF; -======= - //synchronized (lock) { - /*[PR CMVC 88976] the Thread is alive until cleanup() is called */ - return threadRef != NO_REF; - //} ->>>>>>> 57117bc3e7 (Stop acquiring ThreadLock in some j.l.Thread methods) } /** @@ -768,15 +761,8 @@ public final boolean isAlive() { * @see Thread#isAlive */ private boolean isDead() { -<<<<<<< HEAD /* Has already started and is not alive anymore. */ return (started && (threadRef == NO_REF)); -======= - // Has already started, is not alive anymore, and has been removed from the ThreadGroup -// synchronized(lock) { - return started && threadRef == NO_REF; -// } ->>>>>>> 57117bc3e7 (Stop acquiring ThreadLock in some j.l.Thread methods) } /**