Fixed calculation of ttl for event overview stage

This commit is contained in:
Steffen Schaefer committed 2015-05-21 19:39:32 +02:00
1 parent ea2dbf906c
commit 6a8b8347df
4 files changed
+6 -8

No files matched your search

@@ -4,13 +4,11 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
import java.util.Random;
@@ -5,14 +5,14 @@ public class ResultWithTTL<T extends DTO> implements Result {
/**
* Time To Live in millisecs.
*/
private int ttl;
private long ttl;
private T dto;
public ResultWithTTL() {
}
public ResultWithTTL(int ttl, T dto) {
public ResultWithTTL(long ttl, T dto) {
super();
this.ttl = ttl;
this.dto = dto;
@@ -22,7 +22,7 @@ public class ResultWithTTL<T extends DTO> implements Result {
return dto;
}
public int getTtl() {
public long getTtl() {
return ttl;
}
}
@@ -31,12 +31,12 @@ public class GetEventOverviewStageAction implements Action<ResultWithTTL<EventOv
MillisecondsTimePoint now = MillisecondsTimePoint.now();
Event event = context.getRacingEventService().getEvent(eventId);
EventState state = HomeServiceUtil.calculateEventState(event);
int ttl = 1000 * 60 * 5;
long ttl = 1000 * 60 * 5;
if(state == EventState.RUNNING) {
ttl = 1000 * 60 * 2;
}
if(state == EventState.UPCOMING || state == EventState.PLANNED) {
ttl = Math.min(ttl, (int) now.until(event.getStartDate()).asMillis());
ttl = Math.min(ttl, now.until(event.getStartDate()).asMillis());
}
// TODO get correct message
@@ -14,7 +14,7 @@ final class LiveRaceCalculator implements RaceCallback {
}
public ResultWithTTL<LiveRacesDTO> getResult() {
int ttl = 1000 * 60 * 2;
long ttl = 1000 * 60 * 2;
for(LiveRaceDTO race : result.getRaces()) {
if(race.getViewState() == RaceViewState.RUNNING) {
ttl = Math.min(ttl, 1000 * 30);