From 5f82802aec753cf0fe4613a34d67fada2e7d17df Mon Sep 17 00:00:00 2001 From: ocean Date: Fri, 30 Dec 2005 03:24:18 +0000 Subject: [PATCH] * lib/generator.rb: (Generator#initialize) fixed dead lock. this occured when end? was called before @loop_thread was stopped. [ruby-core:7029] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/generator.rb | 1 + 2 files changed, 6 insertions(+) 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 + + * 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 * 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