From 881872051a1267a4fc7d263b4e057fa4783409b5 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 12 Mar 2014 00:07:52 +0100
Subject: [PATCH] fixed locking; this commit fixes the failing test for bug
 1666

---
 .../src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
index 5bbd4c880eb..6e8d605cc8b 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
@@ -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();
         }
     }
 }