33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
|
From 49ad3f954f69c6e838c8cd112ad79aa5fa8e7153 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mark Thomas <markt@apache.org>
|
||
|
|
Date: Wed, 5 Feb 2020 14:47:48 +0000
|
||
|
|
Subject: [PATCH] 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 63ff6c5a63..7cfdf0accf 100644
|
||
|
|
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
|
||
|
|
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
|
||
|
|
@@ -257,13 +257,13 @@ protected Processor createUpgradeProcessor(SocketWrapperBase<?> socket,
|
||
|
|
|
||
|
|
|
||
|
|
@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();
|
||
|
|
}
|
||
|
|
}
|