This is an automated email from the ASF dual-hosted git repository.
remm 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 a2a8d31c06 Don't override generatedCodeLocation if set
a2a8d31c06 is described below
commit a2a8d31c0679f444e26e64472d08446c4d69768d
Author: remm <[email protected]>
AuthorDate: Mon Nov 25 13:45:44 2024 +0100
Don't override generatedCodeLocation if set
---
java/org/apache/catalina/startup/Catalina.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 7cf1730885..978908ee83 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -570,7 +570,7 @@ public class Catalina {
if (!generatedCodeLocation.isAbsolute()) {
generatedCodeLocation = new
File(Bootstrap.getCatalinaHomeFile(), generatedCodeLocationParameter);
}
- } else {
+ } else if (generatedCodeLocation == null) {
generatedCodeLocation = new
File(Bootstrap.getCatalinaHomeFile(), "work");
}
serverXmlLocation = new File(generatedCodeLocation,
generatedCodePackage);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
