Fixed Thread#join(timeout). Closes #3390.

The thread joining would not be signaled until the timeout expired.
rubinius · May 8, 2015 · cda061a · cda061a
1 parent 0e2ace2
commit cda061a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/vm/builtin/thread.cpp b/vm/builtin/thread.cpp
@@ -500,11 +500,9 @@ namespace rubinius {
           struct timespec ts = {0,0};
           self->join_cond_.offset(&ts, as<Float>(timeout)->val);
 
-          for(;;) {
-            if(self->join_cond_.wait_until(self->join_lock_, &ts)
+          if(self->join_cond_.wait_until(self->join_lock_, &ts)
                 == utilities::thread::cTimedOut) {
-              return nil<Thread>();
-            }
+            return nil<Thread>();
           }
         }
       }