UNDERTOW-1337 Deployment does not fail if invalid websocket deploymen…

…ts are added

servlet/src/main/java/io/undertow/servlet/api/DeploymentInfo.java

@@ -35,6 +35,7 @@
 
 import javax.servlet.DispatcherType;
 import javax.servlet.MultipartConfigElement;
+import javax.servlet.ServletContextListener;
 import javax.servlet.descriptor.JspConfigDescriptor;
 
 import io.undertow.security.api.AuthenticationMechanism;
@@ -193,6 +194,8 @@ public class DeploymentInfo implements Cloneable {
 
     private boolean checkOtherSessionManagers = true;
 
+    private final List<ServletContextListener> deploymentCompleteListeners = new ArrayList<>();
+
     /**
      * A map of content encoding to file extension for pre compressed resource (e.g. gzip -> .gz)
      */
@@ -1348,6 +1351,23 @@ public DeploymentInfo setContainerMinorVersion(int containerMinorVersion) {
         return this;
     }
 
+    /**
+     * Add's a listener that is only invoked once all other deployment steps have been completed
+     *
+     * The listeners <code>contextDestroyed</code> method will be called after all undeployment steps are undertaken
+     *
+     * @param servletContextListener
+     * @return
+     */
+    public DeploymentInfo addDeploymentCompleteListener(ServletContextListener servletContextListener) {
+        deploymentCompleteListeners.add(servletContextListener);
+        return this;
+    }
+
+    public List<ServletContextListener> getDeploymentCompleteListeners() {
+        return Collections.unmodifiableList(deploymentCompleteListeners);
+    }
+
     @Override
     public DeploymentInfo clone() {
         final DeploymentInfo info = new DeploymentInfo()
@@ -1440,6 +1460,7 @@ public DeploymentInfo clone() {
         info.preCompressedResources.putAll(preCompressedResources);
         info.containerMajorVersion = containerMajorVersion;
         info.containerMinorVersion = containerMinorVersion;
+        info.deploymentCompleteListeners.addAll(deploymentCompleteListeners);
         return info;
     }
 

servlet/src/main/java/io/undertow/servlet/core/DeploymentManagerImpl.java

@@ -90,6 +90,8 @@
 
 import javax.servlet.ServletContainerInitializer;
 import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
 import javax.servlet.ServletException;
 
 import java.io.File;
@@ -253,6 +255,9 @@ public Void call(HttpServerExchange exchange, Object ignore) throws Exception {
         //any problems with the paths won't get detected until the data is initialize
         //so we force initialization here
         deployment.getServletPaths().initData();
+        for(ServletContextListener listener : deploymentInfo.getDeploymentCompleteListeners()) {
+            listener.contextInitialized(new ServletContextEvent(servletContext));
+        }
         state = State.DEPLOYED;
     }
 
@@ -660,6 +665,9 @@ public void undeploy() {
             deployment.createThreadSetupAction(new ThreadSetupHandler.Action<Void, Object>() {
                 @Override
                 public Void call(HttpServerExchange exchange, Object ignore) throws ServletException {
+                    for(ServletContextListener listener : deployment.getDeploymentInfo().getDeploymentCompleteListeners()) {
+                        listener.contextDestroyed(new ServletContextEvent(deployment.getServletContext()));
+                    }
                     deployment.destroy();
                     deployment = null;
                     state = State.UNDEPLOYED;

websockets-jsr/src/main/java/io/undertow/websockets/jsr/Bootstrap.java

@@ -104,6 +104,12 @@ public void handleDeployment(DeploymentInfo deploymentInfo, ServletContext servl
         SecurityActions.addContainer(deploymentInfo.getClassLoader(), container);
 
         deploymentInfo.addListener(Servlets.listener(WebSocketListener.class));
+        deploymentInfo.addDeploymentCompleteListener(new ServletContextListener() {
+            @Override
+            public void contextInitialized(ServletContextEvent sce) {
+                container.validateDeployment();
+            }
+        });
     }
 
     private static final class WebSocketListener implements ServletContextListener {

websockets-jsr/src/main/java/io/undertow/websockets/jsr/ServerWebSocketContainer.java

@@ -787,14 +787,20 @@ private ConfiguredClientEndpoint getClientEndpoint(final Class<?> endpointType,
     }
 
 
-    public void deploymentComplete() {
+
+    public void validateDeployment() {
         if(!deploymentExceptions.isEmpty()) {
-            Exception e = JsrWebSocketMessages.MESSAGES.deploymentFailedDueToProgramaticErrors();
+            RuntimeException e = JsrWebSocketMessages.MESSAGES.deploymentFailedDueToProgramaticErrors();
             for(DeploymentException ex : deploymentExceptions) {
                 e.addSuppressed(ex);
             }
+            throw e;
         }
+    }
+
+    public void deploymentComplete() {
         deploymentComplete = true;
+        validateDeployment();
     }
 
     public List<ConfiguredServerEndpoint> getConfiguredServerEndpoints() {