Fully decode #9444

updates from review.
jetty · Mar 10, 2023 · 92c0504 · 92c0504
1 parent 4c71870
commit 92c0504
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java
@@ -100,7 +100,6 @@ public interface Context extends Attributes, Decorator, Executor
      *        per {@link org.eclipse.jetty.util.URIUtil#canonicalPath(String)}
      * @return the URI path scoped to this Context, or {@code null} if the full path does not match this Context.
      *         The empty string is returned if the full path is exactly the context path.
-     *
      */
     default String getPathInContext(String canonicallyEncodedPath)
     {

diff --git a/...10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java b/...10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java
@@ -1248,7 +1248,7 @@ public Map<String, String> getTrailerFields()
         return trailersMap;
     }
 
-    public static class AmbiguousURI extends ServletApiRequest
+    static class AmbiguousURI extends ServletApiRequest
     {
         protected AmbiguousURI(ServletContextRequest servletContextRequest)
         {

diff --git a/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextRequest.java b/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextRequest.java
@@ -40,13 +40,10 @@
 import org.eclipse.jetty.session.ManagedSession;
 import org.eclipse.jetty.session.SessionManager;
 import org.eclipse.jetty.util.Fields;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class ServletContextRequest extends ContextRequest
 {
     public static final String MULTIPART_CONFIG_ELEMENT = "org.eclipse.jetty.multipartConfig";
-    private static final Logger LOG = LoggerFactory.getLogger(ServletContextRequest.class);
     static final int INPUT_NONE = 0;
     static final int INPUT_STREAM = 1;
     static final int INPUT_READER = 2;