archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 35433:

Browse source 
* test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill.
	  [ruby-dev:45551] reported by NARUSE, Yui.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-05-19 05:42:08 +00:00
parent 28db23778c
commit ca27aa831f
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat May 19 14:41:45 2012 Tanaka Akira <akr@fsij.org>
* test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill.
[ruby-dev:45551] reported by NARUSE, Yui.
Sat May 19 14:41:09 2012 Tanaka Akira <akr@fsij.org>
* lib/drb/extservm.rb (DRb::ExtServManager): don't use /bin/sh to

10
test/drb/drbtest.rb
View file

@ -75,7 +75,10 @@ module DRbCore
DRbService.manager.unregist(@service_name)
Thread.list.each {|th|
if th.respond_to?(:pid) && th[:drb_service] == @service_name
Process.kill :TERM, th.pid
begin
Process.kill :TERM, th.pid
rescue Errno::ESRCH
end
th.join
end
}
@ -289,7 +292,10 @@ module DRbAry
DRbService.manager.unregist(@service_name)
Thread.list.each {|th|
if th.respond_to?(:pid) && th[:drb_service] == @service_name
Process.kill :TERM, th.pid
begin
Process.kill :TERM, th.pid
rescue Errno::ESRCH
end
th.join
end
}

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 220
#define RUBY_PATCHLEVEL 221
#define RUBY_RELEASE_DATE "2012-05-19"
#define RUBY_RELEASE_YEAR 2012