From 590b1a6ab17680b2793e4a1181e6226929cf732a Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 18 May 2020 11:49:12 +1000 Subject: [PATCH] Issue #4873 - fix timeout on ExecutorThreadPool.join() Signed-off-by: Lachlan Roberts --- .../java/org/eclipse/jetty/util/thread/ExecutorThreadPool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ExecutorThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ExecutorThreadPool.java index db558cb8b89..9d1e2f0ea97 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ExecutorThreadPool.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ExecutorThreadPool.java @@ -302,7 +302,7 @@ public class ExecutorThreadPool extends ContainerLifeCycle implements ThreadPool @Override public void join() throws InterruptedException { - _executor.awaitTermination(getStopTimeout(), TimeUnit.MILLISECONDS); + _executor.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS); } @Override