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

throw ISE if the WebSocketSCI configure() is called on a started ServletContextHandler
jetty · Oct 16, 2020 · 681f46b · 681f46b
2 parents c95fc2a + 7ed6998
commit 681f46b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...clipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java b/...clipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
@@ -99,6 +99,9 @@ public interface Configurator
      */
     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)

diff --git a/.../org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java b/.../org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
@@ -53,6 +53,9 @@ public interface Configurator
      */
     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())