This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new df6cb41858 Revert unintended change.
df6cb41858 is described below
commit df6cb41858b032270f72a6945646a1566d98957c
Author: Mark Thomas <[email protected]>
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 0b60e03362..84565ffe23 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -1234,7 +1234,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: [email protected]
For additional commands, e-mail: [email protected]
