eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-09 13:50:57 +00:00
Code Activity

avoid NPE in leaderboard DTO calculation in case competitor track is not found (e.g., untracked competitor)

Browse Source
This commit is contained in:
Axel Uhl committed 2014-05-15 10:31:22 +02:00
1 parent beed4ed4ea
commit 0de90765a3
1 file changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
+6 -4
View File
@@ -1302,9 +1302,12 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
entryDTO.totalPoints = entry.getTotalPoints();
entryDTO.reasonForMaxPoints = entry.getMaxPointsReason();
entryDTO.discarded = entry.isDiscarded();
final GPSFixTrack<Competitor, GPSFixMoving> track = trackedRace.getTrack(competitor);
if (trackedRace != null) {
Date timePointOfLastPositionFixAtOrBeforeQueryTimePoint = getTimePointOfLastFixAtOrBefore(competitor, trackedRace, timePoint);
entryDTO.averageSamplingInterval = trackedRace.getTrack(competitor).getAverageIntervalBetweenFixes();
if (track != null) {
entryDTO.averageSamplingInterval = track.getAverageIntervalBetweenFixes();
}
if (timePointOfLastPositionFixAtOrBeforeQueryTimePoint != null) {
long timeDifferenceInMs = timePoint.asMillis() - timePointOfLastPositionFixAtOrBeforeQueryTimePoint.getTime();
entryDTO.timeSinceLastPositionFixInSeconds = timeDifferenceInMs == 0 ? 0.0 : timeDifferenceInMs / 1000.0;
@@ -1341,12 +1344,11 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
competitor, startOfRace);
entryDTO.distanceToStartLineAtStartOfRaceInMeters = distanceToStartLineAtStartOfRace == null ? null
: distanceToStartLineAtStartOfRace.getMeters();
Speed speedAtStartTime = trackedRace.getTrack(competitor)
.getEstimatedSpeed(startOfRace);
Speed speedAtStartTime = track == null ? null : track.getEstimatedSpeed(startOfRace);
entryDTO.speedOverGroundAtStartOfRaceInKnots = speedAtStartTime == null ? null
: speedAtStartTime.getKnots();
TimePoint competitorStartTime = firstMarkPassing.getTimePoint();
Speed competitorSpeedWhenPassingStart = trackedRace.getTrack(competitor)
Speed competitorSpeedWhenPassingStart = track == null ? null : track
.getEstimatedSpeed(competitorStartTime);
entryDTO.speedOverGroundAtPassingStartWaypointInKnots = competitorSpeedWhenPassingStart == null ? null
: competitorSpeedWhenPassingStart.getKnots();