[tomcat] branch 10.1.x updated: Revert unintended change.

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 71ed599c00 Revert unintended change.
71ed599c00 is described below

commit 71ed599c000ca09bcb67ac8ed195371f899aa215
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 14 19:31:31 2023 +0000

    Revert unintended change.
    
    This was me testing things and I failed to revert this change before
    committing.
---
 java/org/apache/catalina/startup/Tomcat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/startup/Tomcat.java 
b/java/org/apache/catalina/startup/Tomcat.java
index debc382397..1504013115 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -1235,7 +1235,7 @@ public class Tomcat {
     }
 
     protected URL getWebappConfigFile(String path, String contextName) {
-        File docBase = new File(server.getCatalinaBase(), path);
+        File docBase = new File(path);
         if (docBase.isDirectory()) {
             return getWebappConfigFileFromDirectory(docBase, contextName);
         } else {


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