Always register the default servlet

undertow-io · Jul 23, 2013 · 71c5a69 · 71c5a69
1 parent 737e893
commit 71c5a69
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/servlet/src/main/java/io/undertow/servlet/handlers/ServletPathMatches.java b/servlet/src/main/java/io/undertow/servlet/handlers/ServletPathMatches.java
@@ -157,12 +157,13 @@ private ServletPathMatchesData setupServletChains() {
                 }
             }
         }
+        //we always create a default servlet, even if it is not going to have any path mappings registered
+        final DefaultServletConfig config = deploymentInfo.getDefaultServletConfig() == null ? new DefaultServletConfig() : deploymentInfo.getDefaultServletConfig();
+        DefaultServlet defaultInstance = new DefaultServlet(deployment, config, deploymentInfo.getWelcomePages());
+        final ServletHandler managedDefaultServlet = servlets.addServlet(new ServletInfo(DEFAULT_SERVLET_NAME, DefaultServlet.class, new ImmediateInstanceFactory<Servlet>(defaultInstance)));
 
         if (defaultServlet == null) {
-            //no explicit default servlet was specified, so we create our own
-            final DefaultServletConfig config = deploymentInfo.getDefaultServletConfig() == null ? new DefaultServletConfig() : deploymentInfo.getDefaultServletConfig();
-            DefaultServlet defaultInstance = new DefaultServlet(deployment, config, deploymentInfo.getWelcomePages());
-            final ServletHandler managedDefaultServlet = servlets.addServlet(new ServletInfo(DEFAULT_SERVLET_NAME, DefaultServlet.class, new ImmediateInstanceFactory<Servlet>(defaultInstance)));
+            //no explicit default servlet was specified, so we register our mapping
             pathMatches.add("/*");
             defaultServlet = managedDefaultServlet;
             defaultHandler = new ServletChain(defaultServlet, managedDefaultServlet.getManagedServlet(), null);