Merge remote-tracking branch 'origin' into 1.8.7

rubinius · May 8, 2015 · 216805b · 216805b
2 parents 8e023e1 + cda061a
commit 216805b
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>();
           }
         }
       }