diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-30 03:24:18 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-30 03:24:18 +0000 |
| commit | 255948ae4ea45b6d0d2c0dc3a972e67886ceacdf (patch) | |
| tree | 2085f7fdd19b1c3aebd0a79c87773f7f548b753f | |
| parent | 0cf2b09131539a58702cde5dfec49fc59eefeab3 (diff) | |
| download | ruby-255948ae4ea45b6d0d2c0dc3a972e67886ceacdf.tar.gz ruby-255948ae4ea45b6d0d2c0dc3a972e67886ceacdf.tar.xz ruby-255948ae4ea45b6d0d2c0dc3a972e67886ceacdf.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@9768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/generator.rb | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -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 1086e0fbe..bf50004c8 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 |