aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/drb/drb.rb15
2 files changed, 4 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 1067baef58..9ee3eedce0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* ext/date/date_core.c (d_lite_marshal_load): should give converted value.
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index b4ccc11306..20f00e8ca9 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1412,20 +1412,6 @@ module DRb
end
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
Thread.start do
begin
@@ -1434,7 +1420,6 @@ module DRb
end
ensure
@protocol.close if @protocol
- kill_sub_thread
end
end
end