[tomcat] branch main updated: Refactor. Using List interface so use ArrayList rather than LinkedList

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 9c113f3918 Refactor. Using List interface so use ArrayList rather than 
LinkedList
9c113f3918 is described below

commit 9c113f3918dfdeb3f9c188d48878af6e6c0b6357
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Oct 5 18:08:17 2022 +0100

    Refactor. Using List interface so use ArrayList rather than LinkedList
---
 java/org/apache/catalina/filters/CorsFilter.java       | 4 ++--
 java/org/apache/catalina/filters/RemoteCIDRFilter.java | 3 +--
 java/org/apache/catalina/realm/CombinedRealm.java      | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/filters/CorsFilter.java 
b/java/org/apache/catalina/filters/CorsFilter.java
index b3d187e59b..618ffb0eeb 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -18,11 +18,11 @@ package org.apache.catalina.filters;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -304,7 +304,7 @@ public class CorsFilter extends GenericFilter {
         // Section 6.2.4
         String accessControlRequestHeadersHeader = request.getHeader(
                 CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
-        List<String> accessControlRequestHeaders = new LinkedList<>();
+        List<String> accessControlRequestHeaders = new ArrayList<>();
         if (accessControlRequestHeadersHeader != null &&
                 !accessControlRequestHeadersHeader.trim().isEmpty()) {
             String[] headers = 
accessControlRequestHeadersHeader.trim().split(",");
diff --git a/java/org/apache/catalina/filters/RemoteCIDRFilter.java 
b/java/org/apache/catalina/filters/RemoteCIDRFilter.java
index a134ed1d70..edbe6d8052 100644
--- a/java/org/apache/catalina/filters/RemoteCIDRFilter.java
+++ b/java/org/apache/catalina/filters/RemoteCIDRFilter.java
@@ -22,7 +22,6 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 import jakarta.servlet.FilterChain;
@@ -220,7 +219,7 @@ public final class RemoteCIDRFilter extends FilterBase {
             return Collections.emptyList();
         }
 
-        final List<String> messages = new LinkedList<>();
+        final List<String> messages = new ArrayList<>();
         NetMask nm;
 
         for (final String s : input.split("\\s*,\\s*")) {
diff --git a/java/org/apache/catalina/realm/CombinedRealm.java 
b/java/org/apache/catalina/realm/CombinedRealm.java
index 964e2a8475..573441f79c 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -18,8 +18,8 @@ package org.apache.catalina.realm;
 
 import java.security.Principal;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 
 import javax.management.ObjectName;
@@ -50,7 +50,7 @@ public class CombinedRealm extends RealmBase {
     /**
      * The list of Realms contained by this Realm.
      */
-    protected final List<Realm> realms = new LinkedList<>();
+    protected final List<Realm> realms = new ArrayList<>();
 
     /**
      * Add a realm to the list of realms that will be used to authenticate


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