Merge pull request #98 from GoogleCloudPlatform:EE10-ResourceFileServlet

PiperOrigin-RevId: 613957413 Change-Id: I621f30999e2d9c21fcf0b67edbd3f4126a060ca4
GoogleCloudPlatform · Mar 8, 2024 · 87fcf04 · 87fcf04
2 parents ddd3366 + 4630fcb
commit 87fcf04
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...l_jetty12/src/main/java/com/google/apphosting/runtime/jetty/ee10/ResourceFileServlet.java b/...l_jetty12/src/main/java/com/google/apphosting/runtime/jetty/ee10/ResourceFileServlet.java
@@ -27,17 +27,17 @@
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Objects;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee10.servlet.ServletHandler;
-import org.eclipse.jetty.http.pathmap.MatchedResource;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 
+import java.io.IOException;
+import java.util.Objects;
+
 /**
  * {@code ResourceFileServlet} is a copy of {@code org.mortbay.jetty.servlet.DefaultServlet} that
  * has been trimmed down to only support the subset of features that we want to take advantage of
@@ -256,13 +256,13 @@ private boolean maybeServeWelcomeFile(
         (AppVersion) getServletContext().getAttribute(JettyConstants.APP_VERSION_CONTEXT_ATTR);
     ServletHandler handler = chandler.getServletHandler();
 
-    MatchedResource<ServletHandler.MappedServlet> defaultEntry = handler.getMatchedServlet("/");
+    ServletHandler.MappedServlet defaultEntry = handler.getMappedServlet("/");
 
     for (String welcomeName : welcomeFiles) {
       String welcomePath = path + welcomeName;
       String relativePath = welcomePath.substring(1);
 
-      if (!Objects.equals(handler.getMatchedServlet(welcomePath), defaultEntry)) {
+      if (!Objects.equals(handler.getMappedServlet(welcomePath), defaultEntry)) {
         // It's a path mapped to a servlet.  Forward to it.
         RequestDispatcher dispatcher = request.getRequestDispatcher(path + welcomeName);
         return serveWelcomeFileAsForward(dispatcher, included, request, response);