[tomcat] branch 8.5.x updated: Align with 9.0.x

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 6adfd66c77 Align with 9.0.x
6adfd66c77 is described below

commit 6adfd66c77e338674044e4580dd63a2f3499d908
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 4 15:38:16 2023 +0000

    Align with 9.0.x
---
 java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
 java/org/apache/catalina/session/JDBCStore.java       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 6490c00833..498bac896e 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -253,7 +253,7 @@ public class DefaultServlet extends HttpServlet {
 
     /**
      * If a file has a BOM, should that be used in preference to fileEncoding?
-     * Will default to {@code BomConfig.TRUE} in {@link #init()}.
+     * Will default to {@link BomConfig#TRUE} in {@link #init()}.
      */
     private BomConfig useBomIfPresent = null;
 
diff --git a/java/org/apache/catalina/session/JDBCStore.java 
b/java/org/apache/catalina/session/JDBCStore.java
index 1e5f615fa7..e0779095c5 100644
--- a/java/org/apache/catalina/session/JDBCStore.java
+++ b/java/org/apache/catalina/session/JDBCStore.java
@@ -30,6 +30,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
 import javax.naming.Context;
@@ -526,7 +527,7 @@ public class JDBCStore extends StoreBase {
                             preparedKeysSql.setLong(2, 
System.currentTimeMillis());
                         }
                         try (ResultSet rst = preparedKeysSql.executeQuery()) {
-                            ArrayList<String> tmpkeys = new ArrayList<>();
+                            List<String> tmpkeys = new ArrayList<>();
                             if (rst != null) {
                                 while (rst.next()) {
                                     tmpkeys.add(rst.getString(1));


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