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 3fab83693b Fix IDE warnings
3fab83693b is described below
commit 3fab83693bb868a46eba20474631d80c93c05e7c
Author: Mark Thomas <[email protected]>
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 daca9d6746..8f12552ee7 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -1288,6 +1288,8 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements Realm {
* </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: [email protected]
For additional commands, e-mail: [email protected]
