trying to fix bug 1947 (NPE with RaceLogTrackingState when there is no RaceLog attached to a column)

This commit is contained in:
Axel Uhl committed 2014-05-12 21:28:47 +02:00
1 parent 70868ef291
commit ebbd963847
1 file changed
+2 -1
@@ -2099,7 +2099,8 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
raceColumn.getFactor(), fleetDTO, raceColumn.isMedalRace(), raceIdentifier, raceDTO);
RaceLog raceLog = raceColumn.getRaceLog(fleet);
RaceLogTrackingState raceLogTrackingState = new RaceLogTrackingStateAnalyzer(raceLog).analyze();
RaceLogTrackingState raceLogTrackingState = raceLog == null ? RaceLogTrackingState.NOT_A_RACELOG_TRACKED_RACE :
new RaceLogTrackingStateAnalyzer(raceLog).analyze();
boolean raceLogTrackerExists = getService().getRaceTrackerById(raceLog.getId()) != null;
boolean competitorRegistrationsExist = ! new RegisteredCompetitorsAnalyzer(raceLog).analyze().isEmpty();
RaceLogTrackingInfoDTO raceLogTrackingInfo = new RaceLogTrackingInfoDTO(raceLogTrackerExists,