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 0ab464c Fix incorrect argument processing
0ab464c is described below
commit 0ab464c455831fc019f1738828da3297606e8f21
Author: remm <[email protected]>
AuthorDate: Wed Jun 24 13:59:18 2020 +0200
Fix incorrect argument processing
Adding the same break is needed to avoid an error for unknown arguments.
---
java/org/apache/catalina/startup/Tomcat.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/startup/Tomcat.java
b/java/org/apache/catalina/startup/Tomcat.java
index af895ed..65baf1d 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -1350,6 +1350,7 @@ public class Tomcat {
} else if (args[i].equals("--catalina")) {
// This was already processed before
// Skip the rest of the arguments as they are for Catalina
+ break;
} else {
throw new
IllegalArgumentException(sm.getString("tomcat.invalidCommandLine", args[i]));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
