Permalink
Browse files

Merge pull request #1935 from ryoqun/thread-kill-lock

Fix newly-introduced Thread#kill deadlock
  • Loading branch information...
2 parents a69025c + 3b4ed0f commit b7619b91c8b094dbf1e5748c34b8480c0aadcc62 @dbussink dbussink committed Sep 29, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 kernel/bootstrap/thread19.rb
@@ -101,7 +101,9 @@ def setup(prime_lock)
def kill
@dying = true
@sleep = false
- kill_prim
+ Rubinius.synchronize(self) do
+ kill_prim
+ end
end
alias_method :exit, :kill

0 comments on commit b7619b9

Please sign in to comment.