Skip to content

Commit 6d6ea6c

Browse files
committed
Delete now-unused ABORTING status
"aborting" is only presented as status when a thread has been actively killed, which is implemented by a separate flag. The thread remains internally in RUN status, as in CRuby.
1 parent a065064 commit 6d6ea6c

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

core/src/main/java/org/jruby/RubyThread.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public class RubyThread extends RubyObject implements ExecutionContext {
183183

184184
/** Thread statuses */
185185
public enum Status {
186-
RUN, SLEEP, ABORTING, DEAD, NATIVE;
186+
RUN, SLEEP, DEAD, NATIVE;
187187

188188
public final ByteList bytes;
189189

@@ -1932,9 +1932,7 @@ public void enterSleep() {
19321932
}
19331933

19341934
public void exitSleep() {
1935-
if (getStatus() != Status.ABORTING) {
1936-
STATUS.set(this, Status.RUN);
1937-
}
1935+
STATUS.set(this, Status.RUN);
19381936
}
19391937

19401938
private Status getStatus() {

0 commit comments

Comments
 (0)