Merge branch 'master' into bug4811

This commit is contained in:
Axel Uhl committed 2020-07-13 11:02:29 +02:00
commit 23c71e85fa
1 file changed
+2 -1
@@ -86,7 +86,8 @@ public abstract class NonPerformanceCurveRankingMetric extends AbstractRankingMe
final Duration actualRaceDuration = startOfRace.until(timePoint);
final Waypoint finish = getTrackedRace().getRace().getCourse().getLastWaypoint();
for (Competitor competitor : getCompetitors()) {
final MarkPassing finishMarkPassing = getTrackedRace().getMarkPassing(competitor, finish);
// accommodate also for the possibility of an empty course (finish==null)
final MarkPassing finishMarkPassing = finish == null ? null : getTrackedRace().getMarkPassing(competitor, finish);
final Duration timeElapsed;
if (finishMarkPassing != null && finishMarkPassing.getTimePoint().before(timePoint)) {
// competitor has already finished the race at timePoint; so the time elapsed for that competitor stops counting