mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/timeout.rb: join the background thread to make sure it is dead.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
bdce0db7b5
commit
5fcbf61023
2 changed files with 8 additions and 1 deletions
|
@ -1,3 +1,7 @@
|
|||
Sat Dec 15 21:38:24 2007 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* lib/timeout.rb: join the background thread to make sure it is dead.
|
||||
|
||||
Sat Dec 15 20:20:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (enc/Makefile): add external encoding objects list.
|
||||
|
|
|
@ -45,7 +45,10 @@ module Timeout
|
|||
}
|
||||
return yield(sec)
|
||||
ensure
|
||||
y.kill if y and y.alive?
|
||||
if y and y.alive?
|
||||
y.kill
|
||||
y.join # make sure y is dead.
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue