[tomcat] branch master updated: Remove unused code

[ma...@apache.org]

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 de6beb2  Remove unused code
de6beb2 is described below

commit de6beb225fa44c34f4aa6ff6affa23fd70084bfa
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 4 21:33:04 2020 +0100

    Remove unused code
---
 java/org/apache/catalina/startup/Catalina.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index e30ccc2..4761571 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -571,8 +571,6 @@ public class Catalina {
 
         long t1 = System.nanoTime();
 
-        initDirs();
-
         // Before digester - it may be needed
         initNaming();
 
@@ -758,14 +756,6 @@ public class Catalina {
     }
 
 
-    /**
-     * @deprecated unused. Will be removed in Tomcat 10 onwards.
-     */
-    @Deprecated
-    protected void initDirs() {
-    }
-
-
     protected void initStreams() {
         // Replace System.out and System.err with a custom PrintStream
         System.setOut(new SystemLogHandler(System.out));


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