eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-04 03:13:49 +00:00
Code Activity

avoid deadlock by nested waiting for mark passings collections monitor while holding a read lock on the course

Browse Source
This commit is contained in:
Axel Uhl committed 2012-12-18 00:54:59 +01:00
1 parent a6b1b36ab7
commit 4e84ea63e2
1 file changed
+3 -1
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
+3 -1
View File
@@ -1691,11 +1691,13 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener {
boolean markPassingsNotEmpty; boolean markPassingsNotEmpty;
TimePoint extendedFrom = null; TimePoint extendedFrom = null;
MarkPassing crossedFinishLine = null; MarkPassing crossedFinishLine = null;
// getLastWaypoint() will wait for a read lock on the course; do this outside the synchronized block to avoid deadlocks
final Waypoint lastWaypoint = getRace().getCourse().getLastWaypoint();
synchronized (markPassings) { synchronized (markPassings) {
markPassingsNotEmpty = markPassings != null && !markPassings.isEmpty(); markPassingsNotEmpty = markPassings != null && !markPassings.isEmpty();
if (markPassingsNotEmpty) { if (markPassingsNotEmpty) {
extendedFrom = markPassings.iterator().next().getTimePoint(); extendedFrom = markPassings.iterator().next().getTimePoint();
crossedFinishLine = getMarkPassing(competitor, getRace().getCourse().getLastWaypoint()); crossedFinishLine = getMarkPassing(competitor, lastWaypoint);
} }
} }
if (markPassingsNotEmpty) { if (markPassingsNotEmpty) {