ruby-changes:23137
From: nobu <ko1@a...>
Date: Sat, 31 Mar 2012 09:49:05 +0900 (JST)
Subject: [ruby-changes:23137] nobu:r35187 (trunk): misplaced rescue
nobu 2012-03-31 09:48:56 +0900 (Sat, 31 Mar 2012) New Revision: 35187 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35187 Log: misplaced rescue * test/ruby/test_thread.rb (test_condvar_wait_deadlock_2): fix cleanup code which is never executed because of misplaced rescue. Modified files: trunk/test/ruby/test_thread.rb Index: test/ruby/test_thread.rb =================================================================== --- test/ruby/test_thread.rb (revision 35186) +++ test/ruby/test_thread.rb (revision 35187) @@ -158,8 +158,9 @@ assert_raise(Timeout::Error) do Timeout.timeout(0.1) { condvar.wait mutex } end - mutex.unlock rescue - threads[i].each.join + mutex.unlock + threads.each(&:kill) + threads.each(&:join) end def test_condvar_timed_wait -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/