From 162338d75510b98d9d2fbbedf7c4fd2beabcc3c7 Mon Sep 17 00:00:00 2001
From: ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 31 Dec 2005 02:56:46 +0000
Subject: * lib/generator.rb: (Generator#initialize): should kill @loop_thread 
  before starting new thread. (occurs when called via Generator#rewind)  
 [ruby-dev:28184]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        | 6 ++++++
 lib/generator.rb | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9f03661c77..46395c662d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec 31 11:53:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/generator.rb: (Generator#initialize): should kill @loop_thread
+	  before starting new thread. (occurs when called via Generator#rewind)
+	  [ruby-dev:28184]
+
 Fri Dec 30 18:22:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* gc.c (garbage_collect): mark objects refered from aborting threads.
diff --git a/lib/generator.rb b/lib/generator.rb
index 03ff0962d4..c5282785b3 100644
--- a/lib/generator.rb
+++ b/lib/generator.rb
@@ -71,6 +71,8 @@ class Generator
     end
     @index = 0
     @queue = []
+    @main_thread = nil
+    @loop_thread.kill if defined?(@loop_thread)
     @loop_thread = Thread.new do
       Thread.stop
       begin
-- 
cgit v1.2.3