Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into 1.8.7
Browse files Browse the repository at this point in the history
  • Loading branch information
brixen committed May 8, 2015
2 parents 8e023e1 + cda061a commit 216805b
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions vm/builtin/thread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}
}
Expand Down

0 comments on commit 216805b

Please sign in to comment.