From d3590fcb3caea891fa859f8e90f9b48f61e000b9 Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Fri, 31 Jan 2025 14:29:17 +0000
Subject: [PATCH] Fix back port

---
 java/org/apache/catalina/core/ApplicationHttpRequest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index af3eea1fb44d..fdc1dcc73f78 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -733,7 +733,7 @@ void parseParameters() {
         }
 
         Map<String,String[]> requestParameters = getRequest().getParameterMap();
-        if (requestParameters instanceof ParameterMap<String,String[]>) {
+        if (requestParameters instanceof ParameterMap<?,?>) {
             parameters = new ParameterMap<>((ParameterMap<String,String[]>) requestParameters);
         } else {
             parameters = new ParameterMap<>(requestParameters);