Skip to content

Commit

Permalink
Merges
Browse files Browse the repository at this point in the history
Signed-off-by: tajila <[email protected]>
  • Loading branch information
tajila committed Oct 30, 2024
1 parent 9a189fd commit cee0ad8
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions jcl/src/java.base/share/classes/java/lang/Thread.java
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

/**
Expand All @@ -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)
}

/**
Expand Down

0 comments on commit cee0ad8

Please sign in to comment.