From 845c6b457a3820e3e9a9d1e1f64a1f7799a47bef Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Tue, 1 Dec 2020 15:26:25 +0100 Subject: [PATCH] merge jetty-9.4.x into jetty-10.0.x Signed-off-by: Ludovic Orban --- jetty-util/src/main/java/org/eclipse/jetty/util/Pool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Pool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Pool.java index bd7be03f263..b5c8e7c2cee 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Pool.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Pool.java @@ -190,7 +190,7 @@ public class Pool implements AutoCloseable, Dumpable // Iterate the entries, remove overused ones and collect a list of the closeable removed ones. List copy; - try (Locker.Lock l = locker.lock()) + try (AutoLock l = lock.lock()) { if (closed) return;