f-fix-deadlock -> dev

Summary

fix #122 (closed)

Focus

Problem was a non-atomic operation (integer decrement). Concurrent reading thread would fail to decrement the acquired counter. See code annotations.

Test Environment

Please use b2faf630 to see failing tests. Please use 9b85d817 for fixed DatabaseAccessManager

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

• All automated tests pass
• Reference related Issues
• Up-to-date CHANGELOG.md
• Annotations in code (Gitlab comments)
  • Intent of new code
  • Problems with old code
  • Why this implementation?

Check List for the Reviewer

• I understand the intent of this MR
• All automated tests pass
• Up-to-date CHANGELOG.md
• The test environment setup works and the intended behavior is reproducible in the test environment
• In-code documentation and comments are up-to-date.
• Check: Are there spezifications? Are they satisfied?

For further good practices have a look at our review guidelines.

src/main/java/org/caosdb/server/database/DatabaseAccessManager.java

@@ -26,7 +26,6 @@
 package org.caosdb.server.database;
 
 import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 import org.caosdb.server.database.access.Access;
 import org.caosdb.server.database.access.AccessControlAccess;
@@ -57,7 +56,7 @@ import org.caosdb.server.utils.Releasable;
 class ReadAccessSemaphore extends Semaphore implements Releasable {
 
   private static final long serialVersionUID = 4384921156838881337L;
-  private AtomicInteger acquired = new AtomicInteger(0); // how many threads have read access
+  private int acquired = 0; // how many threads have read access
   Semaphore writersBlock =
       new Semaphore(1, true); // This semaphore is blocked as long as there are any
   // unreleased read permits.
@@ -74,9 +73,10 @@ class ReadAccessSemaphore extends Semaphore implements Releasable {
   @Override
   public void acquire() throws InterruptedException {
     super.acquire(); // Protect the next few lines
-    if (this.acquired.getAndIncrement() == 0) {
+    if (this.acquired == 0) {
       this.writersBlock.acquire();
     }
+    this.acquired++;
     super.release();
   }
 
@@ -87,7 +87,9 @@ class ReadAccessSemaphore extends Semaphore implements Releasable {
    */
   @Override
   public void release() {
-    if (this.acquired.decrementAndGet() == 0) { // Last permit: release
+    this.acquired--;
+    if (this.acquired <= 0) { // Last permit: release
+      this.acquired = 0;
       if (this.writersBlock.availablePermits() <= 0) {
         this.writersBlock.release();
       }