Skip to content

Commit

Permalink
Merge pull request ReactiveX#308 from NorthNick/master
Browse files Browse the repository at this point in the history
Ensure now() is always updated in TestScheduler.advanceTo/By
  • Loading branch information
benjchristensen committed Jul 22, 2013
2 parents 9435d44 + 1ee1cb4 commit d318fd6
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ private void triggerActions(long targetTimeInNanos) {
while (!queue.isEmpty()) {
TimedAction<?> current = queue.peek();
if (current.time > targetTimeInNanos) {
time = targetTimeInNanos;
break;
}
time = current.time;
queue.remove();
// because the queue can have wildcards we have to ignore the type T for the state
((Func2<Scheduler, Object, Subscription>) current.action).call(current.scheduler, current.state);
}
time = targetTimeInNanos;
}

@Override
Expand Down

0 comments on commit d318fd6

Please sign in to comment.