[tomcat] branch 7.0.x updated: Fix back-port of bulk operation - addAll() - refactoring

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
     new 5a1b217  Fix back-port of bulk operation - addAll() - refactoring
5a1b217 is described below

commit 5a1b217d1294da58281214d2dac0cb253f554973
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 11:27:10 2020 +0100

    Fix back-port of bulk operation - addAll() - refactoring
---
 java/org/apache/catalina/core/ApplicationHttpRequest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java 
b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index 0d9ec1e..dcb4ff1 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -852,7 +852,7 @@ class ApplicationHttpRequest extends 
HttpServletRequestWrapper {
         if (values1 == null) {
             // Skip - nothing to merge
         } else if (values1 instanceof String[]) {
-            results.addAll(Arrays.asList(values1));
+            results.addAll(Arrays.asList((String[]) values1));
         } else { // String
             results.add(values1.toString());
         }
@@ -860,7 +860,7 @@ class ApplicationHttpRequest extends 
HttpServletRequestWrapper {
         if (values2 == null) {
             // Skip - nothing to merge
         } else if (values2 instanceof String[]) {
-            results.addAll(Arrays.asList(values2));
+            results.addAll(Arrays.asList((String[]) values2));
         } else { // String
             results.add(values2.toString());
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org