locker: With potential connection leak when acquiring lock

killbill · Feb 3, 2025 · d22bc21 · d22bc21
1 parent a08f1d2
commit d22bc21
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/locker/src/main/java/org/killbill/commons/locker/GlobalLockerBaseWithDao.java b/locker/src/main/java/org/killbill/commons/locker/GlobalLockerBaseWithDao.java
@@ -67,10 +67,9 @@ public boolean isFree(final String service, final String lockKey) {
     @Override
     protected GlobalLock doLock(final String lockName) {
         Connection connection = null;
-        boolean obtained = false;
         try {
             connection = dataSource.getConnection();
-            obtained = globalLockDao.lock(connection, lockName, timeout, timeUnit);
+            final boolean obtained = globalLockDao.lock(connection, lockName, timeout, timeUnit);
             if (obtained) {
                 final GlobalLock lock = getGlobalLock(connection, lockName, new ResetReentrantLockCallback() {
                     @Override
@@ -84,7 +83,7 @@ public boolean reset(final String lockName) {
         } catch (final SQLException e) {
             logger.warn("Unable to obtain lock for {}", lockName, e);
         } finally {
-            if (!obtained && connection != null) {
+            if (connection != null) {
                 try {
                     connection.close();
                 } catch (final SQLException e) {