fixing NPE in case polars for non-existing race are requested

This commit is contained in:
Axel Uhl committed 2015-03-30 16:38:21 +02:00
1 parent 5f30a0b6cb
commit d5ade5742d
1 file changed
+11 -5
@@ -1424,12 +1424,18 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
@Override
public Boolean getPolarResults(RegattaAndRaceIdentifier raceIdentifier) {
final Boolean result;
TrackedRace trackedRace = getExistingTrackedRace(raceIdentifier);
BoatClass boatClass = trackedRace.getRace().getBoatClass();
PolarDataService polarData = getService().getPolarDataService();
PolarDiagram polarDiagram = new PolarDiagramGPS(boatClass, polarData);
return new Boolean(polarDiagram != null);
};
if (trackedRace == null) {
result = false;
} else {
BoatClass boatClass = trackedRace.getRace().getBoatClass();
PolarDataService polarData = getService().getPolarDataService();
PolarDiagram polarDiagram = new PolarDiagramGPS(boatClass, polarData);
result = new Boolean(polarDiagram != null);
}
return result;
}
@Override
public SimulatorResultsDTO getSimulatorResults(RegattaAndRaceIdentifier raceIdentifier, Date from, Date prevStartTime) {