Issue #5828 - only use the HttpClient constructor for JavaxWebSocketC…

…lientContainer Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Feb 15, 2021 · b69f470 · b69f470
1 parent 0e4ed5c
commit b69f470
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/.../java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java b/.../java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java
@@ -53,9 +53,7 @@ public static void stop(WebSocketContainer container) throws Exception
     @Override
     public WebSocketContainer getContainer()
     {
-        JavaxWebSocketClientContainer clientContainer = new JavaxWebSocketClientContainer();
-        registerShutdown(clientContainer);
-        return clientContainer;
+        return getContainer(null);
     }
 
     /**

diff --git a/...java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java b/...java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java
@@ -70,17 +70,12 @@ public JavaxWebSocketClientContainer()
      */
     public JavaxWebSocketClientContainer(final HttpClient httpClient)
     {
-        this(new WebSocketComponents(), (wsComponents) -> new WebSocketCoreClient(httpClient, wsComponents));
+        this(new WebSocketComponents(), (components) -> new WebSocketCoreClient(httpClient, components));
     }
 
     public JavaxWebSocketClientContainer(WebSocketComponents components)
     {
-        this(components, (wsComponents) ->
-        {
-            WebSocketCoreClient coreClient = new WebSocketCoreClient(wsComponents);
-            coreClient.getHttpClient().setName("Javax-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode()));
-            return coreClient;
-        });
+        this(components, WebSocketCoreClient::new);
     }
 
     public JavaxWebSocketClientContainer(WebSocketComponents components, Function<WebSocketComponents, WebSocketCoreClient> coreClientFactory)