aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/generator.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fce2790dc8..f75212872d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 30 12:20:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * lib/generator.rb: (Generator#initialize) fixed dead lock. this occured
+ when end? was called before @loop_thread was stopped. [ruby-core:7029]
+
Fri Dec 30 01:04:52 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/generator.rb: should work with another thread. (more robust code)
diff --git a/lib/generator.rb b/lib/generator.rb
index 1086e0fbe4..bf50004c83 100644
--- a/lib/generator.rb
+++ b/lib/generator.rb
@@ -81,6 +81,7 @@ class Generator
@main_thread.wakeup
end
end
+ Thread.pass # ensure @loop_thread to be stopped
self
end