eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-27 07:56:38 +00:00
Code Activity

fixed locking; this commit fixes the failing test for bug 1666

Browse Source
This commit is contained in:
Axel Uhl
2014-03-12 00:07:52 +01:00
parent 528b14b10e
commit 881872051a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
+2 -2
View File
@@ -282,7 +282,7 @@ public class RaceLogImpl extends TrackImpl<RaceLogEvent> implements RaceLog {
@Override
public void merge(RaceLog other) {
lockForRead();
lockForWrite();
other.lockForRead();
try {
RaceLogEventComparator comparator = RaceLogEventComparator.INSTANCE;
@@ -319,8 +319,8 @@ public class RaceLogImpl extends TrackImpl<RaceLogEvent> implements RaceLog {
}
}
} finally {
unlockAfterRead();
other.unlockAfterRead();
unlockAfterWrite();
}
}
}