Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 625fac951466
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6dd82b3cc45d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 12, 2017

  1. Fix failing spec on Thread#status for an externally killed thread tha… 

    …t sleeps (Fixes #4705)
    @iaddict
    iaddict committed Oct 12, 2017
    Copy the full SHA
    bacd973 View commit details

  2. Merge pull request #4815 from iaddict/fix_sleeping_killed_thread_status 

    Fix spec of Thread#status for an externally killed thread that sleeps
    @headius
    headius authored Oct 12, 2017
    Copy the full SHA
    6dd82b3 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −1 core/src/main/java/org/jruby/RubyThread.java
  2. +0 −1 spec/tags/ruby/core/thread/status_tags.txt
4 changes: 3 additions & 1 deletion core/src/main/java/org/jruby/RubyThread.java
View file
Original file line number Diff line number Diff line change
@@ -1511,7 +1511,9 @@ public void enterSleep() {
}

public void exitSleep() {
status.set(Status.RUN);
if (status.get() != Status.ABORTING) {
status.set(Status.RUN);
}
}

@JRubyMethod(name = {"kill", "exit", "terminate"})
1 change: 0 additions & 1 deletion spec/tags/ruby/core/thread/status_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
unstable:Thread#status reports aborting on a killed thread
fails:Thread#status reports aborting on an externally killed thread that sleeps