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
The following commit(s) were added to refs/heads/7.0.x by this push:
new a99c9c9 Correct order
a99c9c9 is described below
commit a99c9c9035b7310b961408c0aeadc39e42a4032c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 27 12:50:45 2020 +0000
Correct order
---
java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 2 +-
java/org/apache/coyote/ajp/LocalStrings.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_fr.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_ko.properties | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index e324783..028549e 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -208,7 +208,7 @@ public abstract class AbstractAjpProtocol<S> extends
AbstractProtocol<S> {
if (getSecretRequired()) {
String secret = getSecret();
if (secret == null || secret.length() == 0) {
- throw new
IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
+ throw new
IllegalArgumentException(sm.getString("ajpprotocol.noSecret"));
}
}
super.start();
diff --git a/java/org/apache/coyote/ajp/LocalStrings.properties
b/java/org/apache/coyote/ajp/LocalStrings.properties
index dfd8fa3..496550c 100644
--- a/java/org/apache/coyote/ajp/LocalStrings.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings.properties
@@ -37,6 +37,6 @@ ajpprocessor.ssl.notsupported=The SSL protocol is not
supported by this connecto
ajpprotocol.endpoint.starterror=Error starting endpoint
ajpprotocol.failedwrite=Socket write failed
ajpprotocol.init=Initializing Coyote AJP/1.3 on [{0}]
-ajpprotocol.nosecret=The AJP Connector is configured with
secretRequired="true" but the secret attribute is either null or "". This
combination is not valid.
+ajpprotocol.noSecret=The AJP Connector is configured with
secretRequired="true" but the secret attribute is either null or "". This
combination is not valid.
ajpprotocol.request.register=Error registering request processor in JMX
ajpprotocol.start=Starting Coyote AJP/1.3 on [{0}]
diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index d6789ae..8a56641 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -28,4 +28,4 @@ ajpprocessor.header.tooLong=Un en-tête de message de taille
[{0}] a été reçu
ajpprocessor.request.prepare=Erreur lors de la préparation de la requête
ajpprocessor.request.process=Erreur de traitement de la requête
-ajpprotocol.nosecret=Le connecteur AJP est configuré avec
secretRequired="true" mais l'attribut secret est soit null soit "", cette
combinaison n'est pas valide
+ajpprotocol.noSecret=Le connecteur AJP est configuré avec
secretRequired="true" mais l'attribut secret est soit null soit "", cette
combinaison n'est pas valide
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index e1ef256..d6869c4 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -28,4 +28,4 @@ ajpprocessor.header.tooLong=길이가 [{0}]인 헤더 메시지를 받았지만,
ajpprocessor.request.prepare=요청을 준비하는 중 오류 발생
ajpprocessor.request.process=요청 처리 중 오류 발생
-ajpprotocol.nosecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다.
이 조합은 유효하지 않습니다.
+ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다.
이 조합은 유효하지 않습니다.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
