Merge branch 'master' into mark-rounding-inference

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
This commit is contained in:
Axel Uhl committed 2015-03-29 20:11:01 +02:00
commit 06872cc3ec
4 files changed
+26 -5

No files matched your search

@@ -193,7 +193,10 @@ DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
@Override
public void setAndFixDelayToLiveInMillis(long delayToLiveInMillis) {
super.setDelayToLiveInMillis(delayToLiveInMillis);
if (getDelayToLiveInMillis() != delayToLiveInMillis) {
super.setDelayToLiveInMillis(delayToLiveInMillis);
notifyListenersDelayToLiveChanged(delayToLiveInMillis);
}
delayToLiveInMillisFixed = true;
}