Merge pull request #80 from aubi/virtualthreads-fix-int-overflow-queu…

…e-size
eclipse-ee4j · Mar 4, 2024 · 3703216 · 3703216
2 parents 86c784c + af706af
commit 3703216
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/.../glassfish/enterprise/concurrent/virtualthreads/VirtualThreadsManagedExecutorService.java b/.../glassfish/enterprise/concurrent/virtualthreads/VirtualThreadsManagedExecutorService.java
@@ -83,7 +83,12 @@ public VirtualThreadsManagedExecutorService(String name,
         if (maxParallelTasks > 0) {
             parallelTasksSemaphore = new Semaphore(maxParallelTasks, true);
             if (queueCapacity > 0) {
-                queuedTasksSemaphore = new Semaphore(queueCapacity + maxParallelTasks, true);
+                int virtualCapacity = queueCapacity + maxParallelTasks;
+                if (virtualCapacity <= 0) {
+                    // int overflow; queue capacity is often MAX_VALUE
+                    virtualCapacity = Integer.MAX_VALUE;
+                }
+                queuedTasksSemaphore = new Semaphore(virtualCapacity, true);
             }
         }
         executor = Executors.newThreadPerTaskExecutor(getManagedThreadFactory());
@@ -111,7 +116,7 @@ protected void executeManagedFutureTask(ManagedFutureTask<?> task) {
             getThreadPoolExecutor().execute(task);
             runningFutures.add(task);
         } else {
-            throw new RejectedExecutionException("Too many tasks submitted (maxParallelTasks=" + maxParallelTasks + ", queueCapacity=" + queueCapacity);
+            throw new RejectedExecutionException("Too many tasks submitted (available = " + (queuedTasksSemaphore == null ? "UNUSED" : queuedTasksSemaphore.availablePermits()) + ", maxParallelTasks = " + maxParallelTasks + ", queueCapacity = " + queueCapacity);
         }
     }