Complete fix for BZ 69285. Optimize creation of ParameterMap

Based on sample code and test cases provided by John Engebretson
apache · Jan 31, 2025 · 78e3639 · 78e3639
1 parent 5f9f1fb
commit 78e3639
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -735,7 +735,12 @@ void parseParameters() {
             return;
         }
 
-        parameters = new ParameterMap<>(getRequest().getParameterMap());
+        Map<String,String[]> requestParameters = getRequest().getParameterMap();
+        if (requestParameters instanceof ParameterMap<String,String[]>) {
+            parameters = new ParameterMap<>((ParameterMap<String,String[]>) requestParameters);
+        } else {
+            parameters = new ParameterMap<>(requestParameters);
+        }
         mergeParameters();
         ((ParameterMap<String,String[]>) parameters).setLocked(true);
         parsedParams = true;

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -160,6 +160,11 @@
         attribute value will also be used by the default and WebDAV Servlets.
         (remm)
       </update>
+      <fix>
+        <bug>69285</bug>: Optimise the creation of the parameter map for
+        included requests. Based on sample code and test cases provided by John
+        Engebretson. (markt)
+      </fix>
       <fix>
         <bug>69527</bug>: Avoid rare cases where a cached resource could be set
         with 0 content length, or could be evicted immediately. (remm)