summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/monitor.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 77e4197f69..9d5cfb83ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 10 11:40:29 2003 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/monitor.rb (wait): return true on signal/broadcastfalse and
+ false on timeout. Thanks Gennady Bystritsky.
+
Mon Nov 10 00:07:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (primary): primary_value may be 0 when syntax error.
diff --git a/lib/monitor.rb b/lib/monitor.rb
index 5eb7bb4e03..fa446a6cfe 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -132,7 +132,9 @@ module MonitorMixin
begin
Thread.stop
+ return true
rescue Timeout
+ return false
ensure
Thread.critical = true
if timeout && timeout_thread.alive?