Fixes runlevel concurrency issue

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
eclipse-ee4j · Jan 29, 2024 · f4e4059 · f4e4059
1 parent 07a0607
commit f4e4059
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/hk2-runlevel/src/main/java/org/glassfish/hk2/runlevel/internal/CurrentTaskFuture.java b/hk2-runlevel/src/main/java/org/glassfish/hk2/runlevel/internal/CurrentTaskFuture.java
@@ -1410,7 +1410,7 @@ private DownQueueRunner(ReentrantLock queueLock,
         @Override
         public void run() {
             for (;;) {
-                ActiveDescriptor<?> job = null;
+                ActiveDescriptor<?> job;
                 queueLock.lock();
                 try {
                     if (caput) return;
@@ -1419,15 +1419,14 @@ public void run() {
                         queueCondition.signal();
                         return;
                     }
-                    job = queue.remove(0);
+                    job = queue.get(0);
                 } finally {
                     queueLock.unlock();
                 }
 
                 try {
                     locator.getServiceHandle(job).destroy();
-                }
-                catch (Throwable th) {
+                } catch (Throwable th) {
                     queueLock.lock();
                     try {
                         parent.lastError = th;
@@ -1436,6 +1435,13 @@ public void run() {
                     } finally {
                         queueLock.unlock();
                     }
+                } finally {
+                    queueLock.lock();
+                    try {
+                        queue.remove(job);
+                    } finally {
+                        queueLock.unlock();
+                    }
                 }
             }