From 87ebe411a66a608b8b73ad5c05ba6a53df1a8e08 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 25 Nov 2004 11:15:33 +0000 Subject: * lib/thwait.rb (ThreadsWait#join_nowait): abnormally terminated threads should be also processed. [ruby-talk:121320] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/thwait.rb | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3138fd00e5..2c6547f64b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 25 20:14:57 2004 Nobuyoshi Nakada + + * lib/thwait.rb (ThreadsWait#join_nowait): abnormally terminated + threads should be also processed. [ruby-talk:121320] + Thu Nov 25 10:14:26 2004 Nobuyoshi Nakada * dir.c (push_braces): do not reuse buffer strings. [ruby-core:03806] diff --git a/lib/thwait.rb b/lib/thwait.rb index 8549ca0884..95d294a85d 100644 --- a/lib/thwait.rb +++ b/lib/thwait.rb @@ -117,8 +117,11 @@ class ThreadsWait @threads.concat threads for th in threads Thread.start(th) do |t| - t.join - @wait_queue.push t + begin + t.join + ensure + @wait_queue.push t + end end end end -- cgit v1.2.3