[tomcat] branch master updated: Fix incorrect argument processing

[re...@apache.org]

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

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 0be0a6a  Fix incorrect argument processing
0be0a6a is described below

commit 0be0a6a65fe02ea9e54e7bf5d4dbbd109dc8d837
Author: remm <re...@apache.org>
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 1ec95c5..5de7256 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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org