Merge branch 'master' into bug1562

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java

@@ -116,6 +116,7 @@ public class LeaderboardEntryDTO implements Serializable {
         result = prime * result + ((fleet == null) ? 0 : fleet.hashCode());
         result = prime * result + ((legDetails == null) ? 0 : legDetails.hashCode());
         result = prime * result + ((netPoints == null) ? 0 : netPoints.hashCode());
+        result = prime * result + ((netPointsUncorrected == null) ? 0 : netPointsUncorrected.hashCode());
         result = prime * result + (netPointsCorrected ? 1231 : 1237);
         result = prime * result + ((race == null) ? 0 : race.hashCode());
         result = prime * result + ((reasonForMaxPoints == null) ? 0 : reasonForMaxPoints.hashCode());
@@ -182,6 +183,11 @@ public class LeaderboardEntryDTO implements Serializable {
                 return false;
         } else if (!netPoints.equals(other.netPoints))
             return false;
+        if (netPointsUncorrected == null) {
+            if (other.netPointsUncorrected != null)
+                return false;
+        } else if (!netPointsUncorrected.equals(other.netPointsUncorrected))
+            return false;
         if (netPointsCorrected != other.netPointsCorrected)
             return false;
         if (race == null) {

java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java

@@ -1814,7 +1814,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
             InterruptedException, ExecutionException {
         LeaderboardDTO result = null;
         if (timePoint == null) {
-            // date==null means live mode; however, if we're after the end of all races and after all score
+            // timePoint==null means live mode; however, if we're after the end of all races and after all score
             // corrections, don't use the live leaderboard updater which would keep re-calculating over and over again, but map
             // this to a usual non-live call which uses the regular LeaderboardDTOCache which is invalidated properly
             // when the tracked race associations or score corrections or tracked race contents changes: