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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 20c8620f7e Don't override generatedCodeLocation if set
20c8620f7e is described below
commit 20c8620f7e6aff8d048360969cf0d007d2e93516
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 4e007803fd..8b3894d74b 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -546,7 +546,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]
