Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #4226 JavaxWebSocketServerContainer leaking into public signature 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2020-01-28 18:16:22 +11:00
parent 6698592139
commit a4b85d1df2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
View File

@ -148,7 +148,7 @@ public class JavaxWebSocketServletContainerInitializer implements ServletContain
* @param context the context to work with * @param context the context to work with
* @return the default {@link ServerContainer} for this context * @return the default {@link ServerContainer} for this context
*/ */
public static JavaxWebSocketServerContainer initialize(ServletContextHandler context) public static ServerContainer initialize(ServletContextHandler context)
{ {
JavaxWebSocketServerContainer serverContainer = JavaxWebSocketServerContainer.getContainer(context.getServletContext()); JavaxWebSocketServerContainer serverContainer = JavaxWebSocketServerContainer.getContainer(context.getServletContext());
if (serverContainer == null) if (serverContainer == null)
@ -180,7 +180,7 @@ public class JavaxWebSocketServletContainerInitializer implements ServletContain
} }
ServletContextHandler servletContextHandler = ServletContextHandler.getServletContextHandler(context, "Javax WebSocket SCI"); ServletContextHandler servletContextHandler = ServletContextHandler.getServletContextHandler(context, "Javax WebSocket SCI");
JavaxWebSocketServerContainer container = initialize(servletContextHandler); ServerContainer container = initialize(servletContextHandler);
try (ThreadClassLoaderScope scope = new ThreadClassLoaderScope(context.getClassLoader())) try (ThreadClassLoaderScope scope = new ThreadClassLoaderScope(context.getClassLoader()))
{ {