]> git.netwichtig.de Git - user/henk/code/ruby/rbot.git/commitdiff
compat19: fix condition monitor waiting
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Thu, 30 Sep 2010 15:30:09 +0000 (17:30 +0200)
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Thu, 30 Sep 2010 15:30:09 +0000 (17:30 +0200)
When timing out during a wait, return false instead of raising. This
fixes a problem with TimeoutError being raised during restarts on
ruby 1.9.x

lib/rbot/compat19.rb

index fbb68477a41789cb887f5200f6dd87459104bcea..c32d1ecbf98544709b6e5d92cf8ed98dbe6c1e96 100644 (file)
@@ -45,6 +45,8 @@ module MonitorMixin
       begin
         @cond.wait(@monitor.instance_variable_get("@mon_mutex"), timeout)
         return true
+      rescue TimeoutError
+        return false
       ensure
         @monitor.__send__(:mon_enter_for_cond, count)
       end