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 1cf93b49e0c2f6b6178d05b635dc99d02202b95a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 27 16:14:17 2019 +0100
Align with 8.5.x - spacing, i18n, use JmxEnabled
---
.../apache/catalina/core/LocalStrings.properties | 6 ++++
.../catalina/core/LocalStrings_fr.properties | 6 ++++
.../catalina/core/LocalStrings_ja.properties | 6 ++++
.../catalina/core/LocalStrings_ko.properties | 6 ++++
.../org/apache/catalina/core/StandardPipeline.java | 41 +++++++++-------------
5 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index ee35f1f..4ae4e63 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -277,6 +277,12 @@ standardHost.warURL=Invalid URL for web application
archive: [{0}]
standardHostValue.customStatusFailed=Custom error page [{0}] could not be
dispatched correctly
+standardPipeline.basic.start=Error starting new basic Valve
+standardPipeline.basic.stop=Error stopping old basic Valve
+standardPipeline.valve.destroy=Error destroying Valve
+standardPipeline.valve.start=Error starting Valve
+standardPipeline.valve.stop=Error stopping Valve
+
standardServer.accept.timeout=The socket listening for the shutdown command
experienced an unexpected timeout [{0}] milliseconds after the call to
accept(). Is this an instance of bug 56684?
standardServer.onameFail=MBean name specified for Server [{0}] is not valid
standardServer.shutdownViaPort=A valid shutdown command was received via the
shutdown port. Stopping the Server instance.
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 0e00ac9..e71b6f4 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -267,6 +267,12 @@ standardHost.warURL=URL vers l''archive d''application web
(war) invalide: [{0}]
standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
+standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de
base
+standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base
+standardPipeline.valve.destroy=Erreur lors de la destruction de la valve
+standardPipeline.valve.start=Erreur lors du démarrage de la valve
+standardPipeline.valve.stop=Erreur lors de l'arrêt de la valve
+
standardServer.accept.timeout=Le socket qui écoute en attendant la commande
d''arrêt a rencontré un délai d''attente dépassé inattendu [{0}] millisecondes
après l''appel à accept()
standardServer.shutdownViaPort=Une commande d'arrêt valide a été reçue sur le
port d'arrêt, arrêt de l'instance du serveur
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index d80ae2b..c002edd 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -267,6 +267,12 @@ standardHost.warURL=Webアプリケーションアーカイブに対する無効
standardHostValue.customStatusFailed=カスタムエラーページ[{0}]を正しくディスパッチできませんでした。
+standardPipeline.basic.start=新しい基本 Valve を開始できません。
+standardPipeline.basic.stop=古い基本 Valve を停止できません。
+standardPipeline.valve.destroy=Valve を破棄できません。
+standardPipeline.valve.start=Valve を開始できません。
+standardPipeline.valve.stop=Valve を停止できません。
+
standardServer.accept.timeout=シャットダウンコマンドをリスンするソケットは、accept()の呼び出し後に予期しないタイムアウト[{0}]ミリ秒を経験しました。
これはバグ56684の一例ですか？
standardServer.shutdownViaPort=有効なシャットダウンコマンドがシャットダウンポート経由で受信されました。
サーバーインスタンスを停止します。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index e2943e2..a440920 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -208,6 +208,12 @@ standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문
standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
+standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생
+standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생
+standardPipeline.valve.destroy=Valve를 소멸시키는 중 오류 발생
+standardPipeline.valve.start=Valve를 시작시키는 중 오류 발생
+standardPipeline.valve.stop=Valve를 중지시키는 중 오류 발생
+
standardServer.accept.timeout=셧다운 명령을 위해 listen하고 있는 소켓이, accept()를 호출 한 후,
예기치 않은 제한 시간 초과([{0}] 밀리초)를 발생시켰습니다. 버그 56684가 발생한 경우일까요?
standardServer.shutdownViaPort=셧다운 포트를 통해 유효한 셧다운 명령을 받았습니다. 서버 인스턴스를 중지시킵니다.
diff --git a/java/org/apache/catalina/core/StandardPipeline.java
b/java/org/apache/catalina/core/StandardPipeline.java
index dc0b72a..a73d947 100644
--- a/java/org/apache/catalina/core/StandardPipeline.java
+++ b/java/org/apache/catalina/core/StandardPipeline.java
@@ -14,28 +14,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.core;
-
import java.util.ArrayList;
+import java.util.List;
import javax.management.ObjectName;
import org.apache.catalina.Contained;
import org.apache.catalina.Container;
+import org.apache.catalina.JmxEnabled;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Pipeline;
import org.apache.catalina.Valve;
import org.apache.catalina.util.LifecycleBase;
-import org.apache.catalina.valves.ValveBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
-
+import org.apache.tomcat.util.res.StringManager;
/**
* Standard implementation of a processing <b>Pipeline</b> that will invoke
@@ -49,11 +47,11 @@ import org.apache.tomcat.util.ExceptionUtils;
*
* @author Craig R. McClanahan
*/
-
public class StandardPipeline extends LifecycleBase
implements Pipeline, Contained {
private static final Log log = LogFactory.getLog(StandardPipeline.class);
+ private static final StringManager sm =
StringManager.getManager(Constants.Package);
// ----------------------------------------------------------- Constructors
@@ -108,8 +106,8 @@ public class StandardPipeline extends LifecycleBase
*/
protected Valve first = null;
- // --------------------------------------------------------- Public Methods
+ // --------------------------------------------------------- Public Methods
/**
* Return descriptive information about this implementation class.
@@ -134,15 +132,12 @@ public class StandardPipeline extends LifecycleBase
// ------------------------------------------------------ Contained Methods
-
/**
* Return the Container with which this Pipeline is associated.
*/
@Override
public Container getContainer() {
-
- return (this.container);
-
+ return this.container;
}
@@ -153,9 +148,7 @@ public class StandardPipeline extends LifecycleBase
*/
@Override
public void setContainer(Container container) {
-
this.container = container;
-
}
@@ -245,9 +238,7 @@ public class StandardPipeline extends LifecycleBase
*/
@Override
public Valve getBasic() {
-
- return (this.basic);
-
+ return this.basic;
}
@@ -277,7 +268,7 @@ public class StandardPipeline extends LifecycleBase
try {
((Lifecycle) oldBasic).stop();
} catch (LifecycleException e) {
- log.error("StandardPipeline.setBasic: stop", e);
+ log.error(sm.getString("standardPipeline.basic.stop"), e);
}
}
if (oldBasic instanceof Contained) {
@@ -299,7 +290,7 @@ public class StandardPipeline extends LifecycleBase
try {
((Lifecycle) valve).start();
} catch (LifecycleException e) {
- log.error("StandardPipeline.setBasic: start", e);
+ log.error(sm.getString("standardPipeline.basic.start"), e);
return;
}
}
@@ -351,7 +342,7 @@ public class StandardPipeline extends LifecycleBase
try {
((Lifecycle) valve).start();
} catch (LifecycleException e) {
- log.error("StandardPipeline.addValve: start: ", e);
+ log.error(sm.getString("standardPipeline.valve.start"), e);
}
}
}
@@ -384,7 +375,7 @@ public class StandardPipeline extends LifecycleBase
@Override
public Valve[] getValves() {
- ArrayList<Valve> valveList = new ArrayList<Valve>();
+ List<Valve> valveList = new ArrayList<Valve>();
Valve current = first;
if (current == null) {
current = basic;
@@ -400,14 +391,14 @@ public class StandardPipeline extends LifecycleBase
public ObjectName[] getValveObjectNames() {
- ArrayList<ObjectName> valveList = new ArrayList<ObjectName>();
+ List<ObjectName> valveList = new ArrayList<ObjectName>();
Valve current = first;
if (current == null) {
current = basic;
}
while (current != null) {
- if (current instanceof ValveBase) {
- valveList.add(((ValveBase) current).getObjectName());
+ if (current instanceof JmxEnabled) {
+ valveList.add(((JmxEnabled) current).getObjectName());
}
current = current.getNext();
}
@@ -453,13 +444,13 @@ public class StandardPipeline extends LifecycleBase
try {
((Lifecycle) valve).stop();
} catch (LifecycleException e) {
- log.error("StandardPipeline.removeValve: stop: ", e);
+ log.error(sm.getString("standardPipeline.valve.stop"), e);
}
}
try {
((Lifecycle) valve).destroy();
} catch (LifecycleException e) {
- log.error("StandardPipeline.removeValve: destroy: ", e);
+ log.error(sm.getString("standardPipeline.valve.destroy"), e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
