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

bug 4297: fixing deadlock by first copying fixes, the releasing track lock, then calling processElement

Browse Source 
Change-Id: Id30d1205d807ef992ff7d2d60184e18deeec389d
This commit is contained in:
Axel Uhl committed 2017-08-31 19:22:25 +02:00
1 parent f35909e698
commit 4c8209624f
1 file changed
+10 -1
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java
+10 -1
View File
@@ -6,6 +6,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
@@ -427,14 +428,22 @@ public class PolarDataMiner {
+ (race.getRace() != null ? race.getRace().getName() : race.getRaceIdentifier().getRaceName()));
for (final Competitor competitor : race.getRace().getCompetitors()) {
final GPSFixTrack<Competitor, GPSFixMoving> track = race.getTrack(competitor);
// it is necessary to release the track's lock before calling processElement
// because processElement will transitively cause obtaining the course lock,
// and other methods will first obtain the course and then the track lock, leading
// to a deadlock. See also bug 4297.
final List<GPSFixMoving> fixes = new ArrayList<>();
track.lockForRead();
try {
for (final GPSFixMoving fix : track.getFixes()) {
preFilteringProcessor.processElement(new GPSFixMovingWithOriginInfo(fix, race, competitor));
fixes.add(fix);
}
} finally {
track.unlockAfterRead();
}
for (final GPSFixMoving fix : fixes) {
preFilteringProcessor.processElement(new GPSFixMovingWithOriginInfo(fix, race, competitor));
}
}
logger.info("Finished injecting fixes for race "
+ (race.getRace() != null ? race.getRace().getName() : race.getRaceIdentifier().getRaceName())