Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Realign timeout with MRI. #5354

Merged
merged 3 commits into from
Oct 11, 2018
Merged

Realign timeout with MRI. #5354

merged 3 commits into from
Oct 11, 2018

Conversation

headius
Copy link
Member

@headius headius commented Oct 11, 2018

Fixes #3834.

  • Use Timeout::Error instead of leaky anonymous exception.
  • Move executor to instance data from static.
  • Clean up redundant, outdated code.
  • Move sharable pieces back into timeout.rb.
  • Eliminate builtin and load ext from timeout.rb.

Fixes jruby#3834.

* Use Timeout::Error instead of leaky anonymous exception.
* Move executor to instance data from static.
* Clean up redundant, outdated code.
* Move sharable pieces back into timeout.rb.
* Eliminate builtin and load ext from timeout.rb.
@headius headius merged commit 6082cfd into jruby:master Oct 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant