This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 8e86977 Fix IDE nags
8e86977 is described below
commit 8e86977b901698c2c67dbaf83f4dba5d7f2c1e02
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jun 23 12:08:20 2020 +0100
Fix IDE nags
---
java/org/apache/catalina/startup/Catalina.java | 4 ++--
java/org/apache/catalina/startup/SetAllPropertiesRule.java | 1 +
java/org/apache/catalina/startup/SetContextPropertiesRule.java | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 5280d32..a0955c1 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -720,7 +720,7 @@ public class Catalina {
}
if(log.isInfoEnabled()) {
- log.info(sm.getString("catalina.init",
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1)));
+ log.info(sm.getString("catalina.init",
Long.toString(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1))));
}
}
@@ -770,7 +770,7 @@ public class Catalina {
}
if (log.isInfoEnabled()) {
- log.info(sm.getString("catalina.startup",
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1)));
+ log.info(sm.getString("catalina.startup",
Long.toString(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1))));
}
// Register shutdown hook
diff --git a/java/org/apache/catalina/startup/SetAllPropertiesRule.java
b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
index 93d59e9..7288fe6 100644
--- a/java/org/apache/catalina/startup/SetAllPropertiesRule.java
+++ b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
@@ -26,6 +26,7 @@ import org.apache.tomcat.util.digester.SetPropertiesRule;
* @author Remy Maucherat
* @deprecated This will be removed in Tomcat 10
*/
+@Deprecated
public class SetAllPropertiesRule extends SetPropertiesRule {
diff --git a/java/org/apache/catalina/startup/SetContextPropertiesRule.java
b/java/org/apache/catalina/startup/SetContextPropertiesRule.java
index fda8742..36ad6a9 100644
--- a/java/org/apache/catalina/startup/SetContextPropertiesRule.java
+++ b/java/org/apache/catalina/startup/SetContextPropertiesRule.java
@@ -27,6 +27,7 @@ import org.apache.tomcat.util.digester.SetPropertiesRule;
* @author Remy Maucherat
* @deprecated This will be removed in Tomcat 10
*/
+@Deprecated
public class SetContextPropertiesRule extends SetPropertiesRule {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
