commit 1aca4a51bd7b56285a69670a52cd5e77a25062a1
author Michael Blow <michael.blow@couchbase.com> Thu Aug 22 12:47:51 2024 -0400
committer Michael Blow <mblow@apache.org> Thu Aug 22 17:03:07 2024 +0000
tree 8de017dc8e05742cf35fa702f2820bed1a79ad0d
parent cda30085fa50f25f812436599701cfcdfdc1c54b
parent aaa5ee78cd0eed738ae94dd234591cef95bc9173

Merge branch 'gerrit/trinity' into 'gerrit/goldfish'

Ext-ref: MB-63188

Change-Id: I9e2ab0b764a4c2a95e6ea829cb24c4a93e218ace

hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java

diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
index 9f01123..a841484 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
@@ -30,6 +30,7 @@
 import java.util.OptionalDouble;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -236,7 +237,8 @@
         try {
             return readFuture.get();
         } catch (InterruptedException ex) { // NOSONAR -- interrupt or rethrow
-            executor.submit(() -> {
+            // we don't use the executor here, since it might be shutting down- this avoids ugly logging at shutdown
+            ForkJoinPool.commonPool().submit(() -> {
                 try {
                     response.close();
                 } catch (IOException e) {