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

Merge pull request #5406 from eclipse/jetty-10.0.x-WebSocketSCI 

throw ISE if the WebSocketSCI configure() is called on a started ServletContextHandler
This commit is contained in:
Lachlan 2020-10-16 17:13:19 +11:00 committed by GitHub
parent c95fc2a3dc 7ed6998a9c
commit 681f46bd2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,6 +99,9 @@ public class JavaxWebSocketServletContainerInitializer implements ServletContain
*/
public static void configure(ServletContextHandler context, Configurator configurator)
{
if (!context.isStopped())
throw new IllegalStateException("configure should be called before starting");
// In this embedded-jetty usage, allow ServletContext.addListener() to
// add other ServletContextListeners (such as the ContextDestroyListener) after
// the initialization phase is over. (important for this SCI to function)

3
jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
View File

@ -53,6 +53,9 @@ public class JettyWebSocketServletContainerInitializer implements ServletContain
*/
public static void configure(ServletContextHandler context, Configurator configurator)
{
if (!context.isStopped())
throw new IllegalStateException("configure should be called before starting");
context.addEventListener(
ContainerInitializer
.asContextListener(new JettyWebSocketServletContainerInitializer())