[tomcat] 05/05: Fix IDE nags

[remm]

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

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

commit 05ba3d4d1ca6261ec12967b1010d34ba7adc6ccb
Author: Mark Thomas <ma...@apache.org>
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 d2456d6..215f179 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -697,7 +697,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))));
         }
     }
 
@@ -747,7 +747,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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org