[JBJCA-1445] Avoid deadlock when the connection is being destroyed on…

… one element pool.
ironjacamar · Jan 26, 2024 · f724974 · f724974
1 parent f8b5ed4
commit f724974
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/.../core/connectionmanager/pool/mcp/SemaphoreConcurrentLinkedDequeManagedConnectionPool.java b/.../core/connectionmanager/pool/mcp/SemaphoreConcurrentLinkedDequeManagedConnectionPool.java
@@ -573,7 +573,14 @@ else if (debug)
          {
             if (pool.getInternalStatistics().isEnabled())
                pool.getInternalStatistics().deltaBlockingFailureCount();
-
+            synchronized (cls) {
+               if (cls.isEmpty()) {
+                  if (debug) {
+                     log.debug("Timeout trying acquire lock but cls is empty. Releasing the orphaned lock");
+                  }
+                  pool.getLock().release();
+               }
+            }
             // We timed out
             throw new ResourceException(
                bundle.noMManagedConnectionsAvailableWithinConfiguredBlockingTimeout(
@@ -746,7 +753,7 @@ else if (debug)
          cl.destroy();
       }
 
-      if (releasePermit)
+      if (releasePermit || (clw != null && clw.hasPermit()))
       {
          pool.getLock().release();
       }