HTTPCLIENT-2391: improved GRACEGUL shutdown of ExecutorService used internally by async clients

ok2c · ok2c · commit 694394ca8f5b · 2025-09-16T13:50:31.000+02:00
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.hc.core5.concurrent.FutureCallback;
@@ -133,7 +134,18 @@ public final void close(final CloseMode closeMode) {
         }
         ioReactor.initiateShutdown();
         ioReactor.close(closeMode);
-        executorService.shutdownNow();
+        if (closeMode == CloseMode.GRACEFUL) {
+            executorService.shutdown();
+            try {
+                if (!executorService.awaitTermination(1, TimeUnit.SECONDS)) {
+                    executorService.shutdownNow();
+                }
+            } catch (final InterruptedException ignore) {
+                Thread.currentThread().interrupt();
+            }
+        } else {
+            executorService.shutdownNow();
+        }
         internalClose(closeMode);
     }
 
