1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/drb/drb.rb (DRbServer#stop_service): join killed thread to

Browse Source 
ensure service stops.  [ruby-dev:40441]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2010-02-18 15:06:06 +00:00
parent 54380d99f8
commit 5a55683bc6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Feb 19 00:04:19 2010 Yusuke Endoh <mame@tsg.ne.jp>
* lib/drb/drb.rb (DRbServer#stop_service): join killed thread to
ensure service stops. [ruby-dev:40441]
Thu Feb 18 22:31:15 2010 Yusuke Endoh <mame@tsg.ne.jp> Thu Feb 18 22:31:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
* math.c (math_atanh): raise ERANGE without calling atanh if absolute * math.c (math_atanh): raise ERANGE without calling atanh if absolute

2
lib/drb/drb.rb
View File

@ -1394,7 +1394,7 @@ module DRb
if Thread.current['DRb'] && Thread.current['DRb']['server'] == self if Thread.current['DRb'] && Thread.current['DRb']['server'] == self
Thread.current['DRb']['stop_service'] = true Thread.current['DRb']['stop_service'] = true
else else
@thread.kill @thread.kill.join
end end
end end