eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-15 06:49:56 +00:00
Code Activity

bug5608: removed redundant put to windTracks in createWindTrack

Browse Source
This commit is contained in:
Axel Uhl committed 2021-07-29 00:11:22 +09:00
1 parent ba72f6acdc
commit 7eaa65bee5
1 file changed
+16 -18
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRaceWithWindEssentials.java
+16 -18
View File
@@ -103,16 +103,21 @@ public abstract class TrackedRaceWithWindEssentials implements TrackedRace {
result = getLegMiddleWindTrack((WindSourceWithAdditionalID) windSource);
} else {
final WindTrack windTrackCreated[] = new WindTrack[1];
// atomically add to windTracks if not yet there and assign to windTrackCreated[0] so we know
// whether creation took place and we need to log/notify. See also bug5608.
result = windTracks.computeIfAbsent(windSource, ws->(windTrackCreated[0]=
windSource.getType() == WindSourceType.MANEUVER_BASED_ESTIMATION
// wind track of wind estimation gets unavailable only in one case: wind estimation was detached
// but it is still running. Hence, return dummy track to complete to finish the run.
? new DummyWindTrackImpl()
: createWindTrack(windSource,
delayForWindEstimationCacheInvalidation == -1 ? getMillisecondsOverWhichToAverageWind() / 2
: delayForWindEstimationCacheInvalidation)));
LockUtil.lockForRead(getSerializationLock());
try {
// atomically add to windTracks if not yet there and assign to windTrackCreated[0] so we know
// whether creation took place and we need to log/notify. See also bug5608.
result = windTracks.computeIfAbsent(windSource, ws->(windTrackCreated[0]=
windSource.getType() == WindSourceType.MANEUVER_BASED_ESTIMATION
// wind track of wind estimation gets unavailable only in one case: wind estimation was detached
// but it is still running. Hence, return dummy track to complete to finish the run.
? new DummyWindTrackImpl()
: createWindTrack(windSource,
delayForWindEstimationCacheInvalidation == -1 ? getMillisecondsOverWhichToAverageWind() / 2
: delayForWindEstimationCacheInvalidation)));
} finally {
LockUtil.unlockAfterRead(getSerializationLock());
}
if (windTrackCreated[0] != null) {
// give subclasses a chance to react to the creation of a wind track *after* is has been added to windTracks
notifyWindTrackHasBeenCreatedAndAddedToWindTracks(windSource, windTrackCreated[0]);
@@ -139,15 +144,8 @@ public abstract class TrackedRaceWithWindEssentials implements TrackedRace {
* no other wind source exists yet.
*/
protected WindTrack createWindTrack(WindSource windSource, long delayForWindEstimationCacheInvalidation) {
WindTrack result = windStore.getWindTrack(trackedRegatta.getRegatta().getName(), this, windSource, millisecondsOverWhichToAverageWind,
return windStore.getWindTrack(trackedRegatta.getRegatta().getName(), this, windSource, millisecondsOverWhichToAverageWind,
delayForWindEstimationCacheInvalidation);
LockUtil.lockForRead(getSerializationLock());
try {
windTracks.put(windSource, result);
} finally {
LockUtil.unlockAfterRead(getSerializationLock());
}
return result;
}
private WindSource getLegMiddleWindSource(TrackedLeg trackedLeg) {