Merge branch 'jetty-12-ee10-DefaultServlet-ResourceFactory' into jett…

…y-12-ck
kohlschuetter · Jan 7, 2023 · 99b7c11 · 99b7c11
2 parents f4b776d + cf13e57
commit 99b7c11
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java b/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java
@@ -108,12 +108,13 @@ public void init() throws ServletException
         _resourceService.setWelcomeFactory(_resourceService);
 
         _baseResource = servletContextHandler.getBaseResource();
+        _resourceFactory = ResourceFactory.closeable();
+
         String rb = getInitParameter("baseResource", "resourceBase");
         if (rb != null)
         {
             try
             {
-                _resourceFactory = ResourceFactory.closeable();
                 _baseResource = _resourceFactory.newResource(rb);
             }
             catch (Exception e)