Applied fix from #7748 missed by cherry-pick

jetty · Apr 6, 2022 · 3fb8d52 · 3fb8d52
1 parent a278d75
commit 3fb8d52
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java b/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java
@@ -53,7 +53,6 @@
 import org.eclipse.jetty.util.ArrayUtil;
 import org.eclipse.jetty.util.MultiException;
 import org.eclipse.jetty.util.MultiMap;
-import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.annotation.ManagedAttribute;
 import org.eclipse.jetty.util.annotation.ManagedObject;
 import org.eclipse.jetty.util.component.DumpableCollection;
@@ -1161,6 +1160,11 @@ protected void updateNameMappings()
         }
     }
 
+    protected ServletPathSpec asPathSpec(String pathSpec)
+    {
+        return new ServletPathSpec(pathSpec);
+    }
+
     protected void updateMappings()
     {
         try (AutoLock ignored = lock())
@@ -1269,7 +1273,7 @@ else if (isAllowDuplicateMappings())
                         finalMapping.getServletName(),
                         getServlet(finalMapping.getServletName()).getSource());
 
-                ServletPathSpec servletPathSpec = new ServletPathSpec(pathSpec);
+                ServletPathSpec servletPathSpec = asPathSpec(pathSpec);
                 MappedServlet mappedServlet = new MappedServlet(servletPathSpec, getServlet(finalMapping.getServletName()));
                 pm.put(servletPathSpec, mappedServlet);
             }

diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHandler.java b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHandler.java
@@ -1246,6 +1246,11 @@ protected void updateNameMappings()
         }
     }
 
+    protected ServletPathSpec asPathSpec(String pathSpec)
+    {
+        return new ServletPathSpec(pathSpec);
+    }
+
     protected void updateMappings()
     {
         try (AutoLock ignored = lock())
@@ -1354,7 +1359,7 @@ else if (isAllowDuplicateMappings())
                         finalMapping.getServletName(),
                         getServlet(finalMapping.getServletName()).getSource());
 
-                ServletPathSpec servletPathSpec = new ServletPathSpec(pathSpec);
+                ServletPathSpec servletPathSpec = asPathSpec(pathSpec);
                 MappedServlet mappedServlet = new MappedServlet(servletPathSpec, getServlet(finalMapping.getServletName()));
                 pm.put(servletPathSpec, mappedServlet);
             }