From edec52893b081581abee4e03e763e137db24713b Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Wed, 4 Aug 2021 16:49:15 +1000 Subject: [PATCH] Add name on WebSocketComponents default threadpool Signed-off-by: Lachlan Roberts --- .../jetty/websocket/core/WebSocketComponents.java | 12 +++++++++++- .../jetty/websocket/client/WebSocketClient.java | 4 ---- .../jetty/websocket/client/HttpClientInitTest.java | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java index 5579b7ad5a0..22353c83b82 100644 --- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java +++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java @@ -57,7 +57,17 @@ public class WebSocketComponents extends ContainerLifeCycle _bufferPool = (bufferPool == null) ? new MappedByteBufferPool() : bufferPool; _inflaterPool = (inflaterPool == null) ? new InflaterPool(CompressionPool.DEFAULT_CAPACITY, true) : inflaterPool; _deflaterPool = (deflaterPool == null) ? new DeflaterPool(CompressionPool.DEFAULT_CAPACITY, Deflater.DEFAULT_COMPRESSION, true) : deflaterPool; - _executor = (executor == null) ? new QueuedThreadPool() : executor; + + if (executor == null) + { + QueuedThreadPool threadPool = new QueuedThreadPool(); + threadPool.setName("WebSocket@" + hashCode()); + _executor = threadPool; + } + else + { + _executor = executor; + } addBean(_inflaterPool); addBean(_deflaterPool); diff --git a/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java index 5e184a3f488..b4ff5563d22 100644 --- a/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java +++ b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java @@ -85,10 +85,6 @@ public class WebSocketClient extends ContainerLifeCycle implements WebSocketPoli { coreClient = new WebSocketCoreClient(httpClient, components); addManaged(coreClient); - - if (httpClient == null) - coreClient.getHttpClient().setName("Jetty-WebSocketClient@" + hashCode()); - frameHandlerFactory = new JettyWebSocketFrameHandlerFactory(this, components); sessionListeners.add(sessionTracker); addBean(sessionTracker); diff --git a/jetty-websocket/websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java b/jetty-websocket/websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java index 4a652c1450e..0159b3d44f8 100644 --- a/jetty-websocket/websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java +++ b/jetty-websocket/websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java @@ -41,7 +41,7 @@ public class HttpClientInitTest assertThat("Executor exists", executor, notNullValue()); assertThat("Executor instanceof", executor, instanceOf(QueuedThreadPool.class)); QueuedThreadPool threadPool = (QueuedThreadPool)executor; - assertThat("QueuedThreadPool.name", threadPool.getName(), startsWith("WebSocketClient@")); + assertThat("QueuedThreadPool.name", threadPool.getName(), startsWith("WebSocket@")); } finally {