[tomcat] 03/03: Refactor secret check

[markt]

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

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit f7180bafc74cb1250c9e9287b68a230f0e1f4645
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 5 14:47:48 2020 +0000

    Refactor secret check
    
    Moving the check to start allows invalid configurations to be fixed via
    JMX and changes to be made followed by stop()/start() for those changes
    to take effect.
---
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index e27c623..e324783 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -204,13 +204,13 @@ public abstract class AbstractAjpProtocol<S> extends 
AbstractProtocol<S> {
 
 
     @Override
-    public void init() throws Exception {
+    public void start() throws Exception {
         if (getSecretRequired()) {
             String secret = getSecret();
             if (secret == null || secret.length() == 0) {
                 throw new 
IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
             }
         }
-        super.init();
+        super.start();
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org