From 1febdae995b2db3b5e3e1749b5faa35611c1b17e Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Sun, 22 Dec 2013 11:52:19 +0100 Subject: [PATCH] Reverted c2aee1a9cceae86ffcedfb8f809a672bc040ff7d because this changes the semantics. The semantics change needs to be discussed further before implementing it at such a critical level. --- .../impl/AbstractSimpleLeaderboardImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java index 916aeb4cbef..d52a8c97463 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java @@ -916,11 +916,11 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race // stop counting when competitor finished the race to = markPassings.last().getTimePoint(); } else { - // seems that the last mark passing is not the finish - that means that - // the competitor did not finish the race - we still want to count - // the time until the last mark passing - if (timePoint.after(markPassings.last().getTimePoint())) { - to = markPassings.last().getTimePoint(); + if (trackedRace.getEndOfTracking() != null + && timePoint.after(trackedRace.getEndOfTracking())) { + result = null; // race not finished until end of tracking; no reasonable value can be + // computed for competitor + break; } else { to = timePoint; }