commit aeddca7dde98b5714de3be56753b8d508d901dda
author Saša Živkov <sasa.zivkov@sap.com> Tue Sep 19 12:59:42 2017 +0200
committer Saša Živkov <sasa.zivkov@sap.com> Tue Sep 19 13:04:21 2017 +0200
tree bda54b92ec937376c419a51e0c9d68af23f8c934
parent f5352eba0cb7c77dd1854dd04a3b6c539ed836b4
parent 4150c7a49f3fe828ee638b4b9e666165e8173c8a

Merge stable-2.13 into stable-2.14

* stable-2.13:
  Fix race condition when removing changeId/accountId locks

Change-Id: I1263f313a5e93c6ea962c1470a3f20e1babae6d8

src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/AbstractIndexRestApiServlet.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/AbstractIndexRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/AbstractIndexRestApiServlet.java
index 5641961..5b7cc60 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/AbstractIndexRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/AbstractIndexRestApiServlet.java
@@ -117,7 +117,9 @@
 
   private void removeIdLock(T id) {
     synchronized (idLocks) {
-      idLocks.remove(id);
+      if (idLocks.get(id).get() == 0) {
+        idLocks.remove(id);
+      }
     }
   }