Merge branch 'master' into spectator

This commit is contained in:
Lennart Hensler committed 2012-02-20 10:55:03 +01:00
commit 2df874f433
1 file changed
+2 -1
@@ -1527,7 +1527,8 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
}
competitorAndTimePointsDTO.setCompetitors(competitors);
competitorAndTimePointsDTO.setStartTime(trackedRace.getStart().asMillis());
competitorAndTimePointsDTO.setTimePointOfNewestEvent(trackedRace.getTimePointOfNewestEvent().asMillis());
competitorAndTimePointsDTO.setTimePointOfNewestEvent(trackedRace.getTimePointOfNewestEvent() == null ? null
: trackedRace.getTimePointOfNewestEvent().asMillis());
}
return competitorAndTimePointsDTO;
}