]> git.netwichtig.de Git - user/henk/code/ruby/rbot.git/commitdiff
ruby 2.0.0: fix for changed @waiters in compat19
authorMatthias H <apoc@sixserv.org>
Wed, 4 Sep 2013 00:28:24 +0000 (02:28 +0200)
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Sat, 2 Nov 2013 10:30:39 +0000 (11:30 +0100)
I don't really know what this is all about, but this
fixes a bug with the compat19 monkeypatching. @waiters
is now a Hash.

http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?revision=38109&view=revision

lib/rbot/compat19.rb

index c32d1ecbf98544709b6e5d92cf8ed98dbe6c1e96..2082ff517a249d02173a8ba200d2abf93e955f6e 100644 (file)
@@ -12,7 +12,11 @@ class ConditionVariable
     begin
       # TODO: mutex should not be used
       @waiters_mutex.synchronize do
-        @waiters.push(Thread.current)
+        if @waiters.instance_of? Hash # ruby 2.0.0?
+          @waiters[Thread.current] = true
+        else
+          @waiters.push(Thread.current)
+        end
       end
       if timeout
         elapsed = mutex.sleep timeout if timeout > 0.0