Merge branch 'master' into bug4522

Change-Id: I9852f381d17f7ab6ca179682009b1a4964ff232f

java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java

@@ -196,6 +196,7 @@ public class RaceCourseReceiver extends AbstractReceiverWithQueue<IControlRoute,
         final int liveDelayInSeconds = tractracRace.getLiveDelay();
         long delayInMillis = liveDelayInSeconds * 1000;
         if (trackedRace != null) {
+            logger.info("Setting delay for race "+trackedRace.getRace().getName()+" to "+delayInMillis+"ms");
             trackedRace.setDelayToLiveInMillis(delayInMillis);
         }
         final TimePoint startTime;

java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java

@@ -363,6 +363,7 @@ public class TracTracRaceTrackerImpl extends AbstractRaceTrackerImpl
                     if (getRace() != null) {
                         DynamicTrackedRace trackedRace = getTrackedRegatta().getExistingTrackedRace(getRace());
                         if (trackedRace != null) {
+                            logger.info("Setting delay to live for race "+trackedRace.getRace().getName()+" to "+delayToLiveInMillis+"ms");
                             trackedRace.setDelayToLiveInMillis(delayToLiveInMillis);
                         }
                     }

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

@@ -355,9 +355,13 @@ DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
 
     @Override
     public void setDelayToLiveInMillis(long delayToLiveInMillis) {
-        if (!delayToLiveInMillisFixed && getDelayToLiveInMillis() != delayToLiveInMillis) {
-            super.setDelayToLiveInMillis(delayToLiveInMillis);
-            notifyListenersDelayToLiveChanged(delayToLiveInMillis);
+        if (!delayToLiveInMillisFixed) {
+            if (getDelayToLiveInMillis() != delayToLiveInMillis) {
+                super.setDelayToLiveInMillis(delayToLiveInMillis);
+                notifyListenersDelayToLiveChanged(delayToLiveInMillis);
+            }
+        } else {
+            logger.info("Not setting live delay for race "+getRace().getName()+" to "+delayToLiveInMillis+"ms because delay has been fixed");
         }
     }
 

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

@@ -2835,6 +2835,7 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
     }
 
     protected void setDelayToLiveInMillis(long delayToLiveInMillis) {
+        logger.info("Setting live delay for race "+getRace().getName()+" to "+delayToLiveInMillis+"ms");
         this.delayToLiveInMillis = delayToLiveInMillis;
     }