ruby-changes:16443
From: nobu <ko1@a...>
Date: Fri, 25 Jun 2010 09:59:01 +0900 (JST)
Subject: [ruby-changes:16443] Ruby:r28428 (trunk): * test/ruby/envutil.rb (EnvUtil#invoke_ruby): get rid of possible
nobu 2010-06-25 09:57:03 +0900 (Fri, 25 Jun 2010) New Revision: 28428 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28428 Log: * test/ruby/envutil.rb (EnvUtil#invoke_ruby): get rid of possible deadlock. Modified files: trunk/ChangeLog trunk/test/ruby/envutil.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 28427) +++ ChangeLog (revision 28428) @@ -1,3 +1,8 @@ +Fri Jun 25 09:56:39 2010 Nobuyoshi Nakada <nobu@r...> + + * test/ruby/envutil.rb (EnvUtil#invoke_ruby): get rid of possible + deadlock. + Fri Jun 25 06:24:25 2010 Nobuyoshi Nakada <nobu@r...> * lib/un.rb (httpd): MaxClients also should be integer. Index: test/ruby/envutil.rb =================================================================== --- test/ruby/envutil.rb (revision 28427) +++ test/ruby/envutil.rb (revision 28428) @@ -88,10 +88,10 @@ in_c.close out_c.close if capture_stdout err_c.close if capture_stderr + th_stdout = Thread.new { out_p.read } if capture_stdout + th_stderr = Thread.new { err_p.read } if capture_stderr in_p.write stdin_data.to_str in_p.close - th_stdout = Thread.new { out_p.read } if capture_stdout - th_stderr = Thread.new { err_p.read } if capture_stderr if (!capture_stdout || th_stdout.join(10)) && (!capture_stderr || th_stderr.join(10)) stdout = th_stdout.value if capture_stdout stderr = th_stderr.value if capture_stderr -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/