(tomcat) branch 8.5.x updated: Fix IDE warnings

[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 d81e4480e6 Fix IDE warnings
d81e4480e6 is described below

commit d81e4480e6c269190499e6e47a4293e753e0d003
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 12 11:37:15 2024 +0000

    Fix IDE warnings
---
 java/org/apache/catalina/realm/RealmBase.java           | 2 ++
 java/org/apache/catalina/security/SecurityListener.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/realm/RealmBase.java 
b/java/org/apache/catalina/realm/RealmBase.java
index b558106fd5..5a82b43667 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -1385,6 +1385,8 @@ public abstract class RealmBase extends 
LifecycleMBeanBase implements org.apache
      * </ul>
      *
      * @param args The parameters passed on the command line
+     *
+     * @throws IOException If an error occurs reading the password file
      */
     public static void main(String args[]) throws IOException {
 
diff --git a/java/org/apache/catalina/security/SecurityListener.java 
b/java/org/apache/catalina/security/SecurityListener.java
index adececd631..e92f7fbbc4 100644
--- a/java/org/apache/catalina/security/SecurityListener.java
+++ b/java/org/apache/catalina/security/SecurityListener.java
@@ -151,7 +151,7 @@ public class SecurityListener implements LifecycleListener {
         } catch (NumberFormatException nfe) {
             // Just use the default and warn the user
             log.warn(sm.getString("SecurityListener.buildDateAgeUnreadable",
-                    ageDays, DEFAULT_BUILD_DATE_WARNING_AGE_DAYS));
+                    ageDays, 
String.valueOf(DEFAULT_BUILD_DATE_WARNING_AGE_DAYS)));
         }
     }
 
@@ -235,7 +235,7 @@ public class SecurityListener implements LifecycleListener {
                 old.add(Calendar.DATE, -allowedAgeDays); // Subtract X days 
from today
 
                 if (buildDate.before(old.getTime())) {
-                    log.warn(sm.getString("SecurityListener.buildDateIsOld", 
allowedAgeDays));
+                    log.warn(sm.getString("SecurityListener.buildDateIsOld", 
String.valueOf(allowedAgeDays)));
                 }
             } catch (ParseException pe) {
                 log.warn(sm.getString("SecurityListener.buildDateUnreadable", 
buildDateString));


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