This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1ca1b5eae06bbf15c458d7826dc32cd2c936c51b Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Mar 20 13:16:50 2025 +0000 Fix IDE warnings --- java/org/apache/catalina/filters/ExpiresFilter.java | 3 --- java/org/apache/catalina/ssi/SSIServlet.java | 1 - .../apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java | 1 - 3 files changed, 5 deletions(-) diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java b/java/org/apache/catalina/filters/ExpiresFilter.java index 9c4890af60..5165e7e77f 100644 --- a/java/org/apache/catalina/filters/ExpiresFilter.java +++ b/java/org/apache/catalina/filters/ExpiresFilter.java @@ -473,9 +473,6 @@ public class ExpiresFilter extends FilterBase { * <p> * Can be expressed like '{@code access plus 1 month 15 days 2 hours}'. * </p> - * - * @param durations List of duration elements. - * @param startingPoint Starting point of the elapse to set in the response. */ protected static class ExpiresConfiguration { /** diff --git a/java/org/apache/catalina/ssi/SSIServlet.java b/java/org/apache/catalina/ssi/SSIServlet.java index f4cbbec032..926c6f8b2d 100644 --- a/java/org/apache/catalina/ssi/SSIServlet.java +++ b/java/org/apache/catalina/ssi/SSIServlet.java @@ -200,7 +200,6 @@ public class SSIServlet extends HttpServlet { } if (stringWriter != null) { printWriter.flush(); - @SuppressWarnings("null") String text = stringWriter.toString(); res.getWriter().write(text); } diff --git a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java index 8ceefe9b68..6d7f8ac98f 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java @@ -665,7 +665,6 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { * @throws IOException Any of the usual Input/Output related exceptions. * @throws ClassNotFoundException A class of a serialized object cannot be found. */ - @SuppressWarnings("resource") private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); this.managers = readObjectImpl().managers; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org