From 3f12adfa6c8a7a97a656b0f086ab3dc9165b9341 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Apr 2009 14:01:43 +0000 Subject: [PATCH] merges r22765 from trunk into ruby_1_9_1. -- * lib/thread.rb (SizedQueue#push): fix limit condition. [ruby-dev:38135] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/thread.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1f62a8833e..c2a47def87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 4 21:21:51 2009 Yusuke Endoh + + * lib/thread.rb (SizedQueue#push): fix limit condition. + [ruby-dev:38135] + Wed Mar 4 03:42:56 2009 James Edward Gray II * lib/csv.rb: A patch from Madoka Yakamamoto to prevent an infinite diff --git a/lib/thread.rb b/lib/thread.rb index 68eeaf5b05..e5585c30bd 100644 --- a/lib/thread.rb +++ b/lib/thread.rb @@ -292,7 +292,7 @@ class SizedQueue < Queue t = nil @mutex.synchronize{ while true - break if @que.length <= @max + break if @que.length < @max @queue_wait.push Thread.current @mutex.sleep end