Merge branch 'master' of ssh://127.0.0.1/home/trac/git

java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java

@@ -159,7 +159,6 @@ DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
     }
     
     protected Object readResolve() {
-        super.readResolve();
         if (markPassingCalculator != null) {
             logListener.setMarkPassingUpdateListener(markPassingCalculator.getListener());
         }

java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java

@@ -295,7 +295,6 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
     private transient ConcurrentMap<TimePoint, Future<Wind>> directionFromStartToNextMarkCache;
 
     protected transient MarkPassingCalculator markPassingCalculator;
-    private final boolean hasMarkPassingCalculator;
     
     private final ConcurrentMap<Mark, GPSFixTrack<Mark, GPSFix>> markTracks;
 
@@ -546,7 +545,6 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
         } else {
             markPassingCalculator = null;
         }
-        hasMarkPassingCalculator = useInternalMarkPassingAlgorithm;
         sensorTracks = new HashMap<>();
         sensorTracksLock = new NamedReentrantReadWriteLock("sensorTracksLock", true);
         // now wait until wind loading has at least started; then we know that the serialization lock is safely held by the loader
@@ -650,17 +648,6 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
         logger.info("Deserialized race " + getRace().getName());
     }
 
-    /**
-     * After the object graph has entirely been re-constructed, create the mark passing calculator if
-     * the original object had one.
-     */
-    protected Object readResolve() {
-        if (hasMarkPassingCalculator) {
-            markPassingCalculator = createMarkPassingCalculator();
-        }
-        return this;
-    }
-
     /**
      * When the {@link TrackedRace} object and the {@link RaceDefinition} and in particular its {@link CourseImpl} objects are not
      * atomically serialized, inconsistencies may occur during de-serialization. In particular, the tracked race's leg-oriented

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java

@@ -5735,7 +5735,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
         for (RaceLogEvent event : raceLog.getUnrevokedEvents()) {
             if (event instanceof RaceLogFixedMarkPassingEventImpl && event.getInvolvedBoats().contains(competitor)) {
                 RaceLogFixedMarkPassingEvent fixedEvent = (RaceLogFixedMarkPassingEvent) event;
-                if (fixedEvent.getZeroBasedIndexOfPassedWaypoint() == indexOfWaypoint) {
+                if (Util.equalsWithNull(fixedEvent.getZeroBasedIndexOfPassedWaypoint(), indexOfWaypoint)) {
                     oldFixedMarkPassingEvent = fixedEvent;
                 }
             }