merge heads

This commit is contained in:
Jimmy Shih
2012-08-27 12:18:08 -07:00
@@ -72,11 +72,7 @@ public class TimerTaskExecutor {
return;
}
long now = System.currentTimeMillis();
long next = tripStatistics.getStartTime();
if (next < now) {
next = now + interval - ((now - next) % interval);
}
long next = System.currentTimeMillis() + interval - (tripStatistics.getTotalTime() % interval);
timer.scheduleAtFixedRate(new PeriodicTimerTask(), new Date(next), interval);
}