From 503689342676448989343e3cbc632b78d7ca1596 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Sat, 12 Jan 2019 10:30:47 +1100 Subject: [PATCH] Issue #3167 cleanups from review Signed-off-by: Greg Wilkins --- .../server/JavaxWebSocketServerContainerInitializer.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java index ea83e56fa66..e58567575a5 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java @@ -20,11 +20,9 @@ package org.eclipse.jetty.websocket.javax.server; import java.util.HashSet; import java.util.Set; -import java.util.concurrent.Executor; + import javax.servlet.ServletContainerInitializer; import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; import javax.servlet.ServletException; import javax.servlet.annotation.HandlesTypes; import javax.websocket.DeploymentException; @@ -33,8 +31,6 @@ import javax.websocket.server.ServerApplicationConfig; import javax.websocket.server.ServerEndpoint; import javax.websocket.server.ServerEndpointConfig; -import org.eclipse.jetty.client.HttpClient; -import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.TypeUtil; @@ -126,7 +122,7 @@ public class JavaxWebSocketServerContainerInitializer implements ServletContaine return; } - JavaxWebSocketServerContainer container = configureContext((ServletContextHandler)(ContextHandler.getContextHandler(context))); + JavaxWebSocketServerContainer container = configureContext(ServletContextHandler.getServletContextHandler(context,"Javax WebSocket SCI")); try (ThreadClassLoaderScope scope = new ThreadClassLoaderScope(context.getClassLoader())) {