lib/drb/drb.rb (kill_sub_thread): remove the method. [ruby-core:34185]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1afbc783d4
commit
c6a506d04d
@ -1,3 +1,7 @@
|
|||||||
|
Sun Jun 12 23:36:46 2011 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
|
||||||
|
|
||||||
|
* lib/drb/drb.rb (kill_sub_thread): remove the method. [ruby-core:34185]
|
||||||
|
|
||||||
Sun Jun 12 21:01:56 2011 Tadayoshi Funaba <tadf@dotrb.org>
|
Sun Jun 12 21:01:56 2011 Tadayoshi Funaba <tadf@dotrb.org>
|
||||||
|
|
||||||
* ext/date/date_core.c (d_lite_marshal_load): should give converted value.
|
* ext/date/date_core.c (d_lite_marshal_load): should give converted value.
|
||||||
|
@ -1412,20 +1412,6 @@ module DRb
|
|||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
def kill_sub_thread
|
|
||||||
Thread.new do
|
|
||||||
grp = ThreadGroup.new
|
|
||||||
grp.add(Thread.current)
|
|
||||||
list = @grp.list
|
|
||||||
while list.size > 0
|
|
||||||
list.each do |th|
|
|
||||||
th.kill if th.alive?
|
|
||||||
end
|
|
||||||
list = @grp.list
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def run
|
def run
|
||||||
Thread.start do
|
Thread.start do
|
||||||
begin
|
begin
|
||||||
@ -1434,7 +1420,6 @@ module DRb
|
|||||||
end
|
end
|
||||||
ensure
|
ensure
|
||||||
@protocol.close if @protocol
|
@protocol.close if @protocol
|
||||||
kill_sub_thread
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user