This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new ef5cf5c Use StringManager. Align with 9.0.x/10.0.x
ef5cf5c is described below
commit ef5cf5c8d4e6fafbb92e1ef55399a89783134d11
Author: Mark Thomas <[email protected]>
AuthorDate: Fri May 21 16:09:34 2021 +0100
Use StringManager. Align with 9.0.x/10.0.x
---
java/org/apache/catalina/core/ContainerBase.java | 28 +++++++++++-----------
.../apache/catalina/core/LocalStrings.properties | 9 +++++++
.../catalina/core/LocalStrings_de.properties | 1 +
.../catalina/core/LocalStrings_fr.properties | 9 +++++++
.../catalina/core/LocalStrings_ja.properties | 9 +++++++
.../catalina/core/LocalStrings_ko.properties | 9 +++++++
.../catalina/core/LocalStrings_zh_CN.properties | 9 +++++++
7 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index 17c4ea9..ef5b53b 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -450,7 +450,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
try {
((Lifecycle) oldCluster).stop();
} catch (LifecycleException e) {
- log.error("ContainerBase.setCluster: stop: ", e);
+ log.error(sm.getString("containerBase.cluster.stop"), e);
}
}
@@ -463,7 +463,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
try {
((Lifecycle) cluster).start();
} catch (LifecycleException e) {
- log.error("ContainerBase.setCluster: start: ", e);
+ log.error(sm.getString("containerBase.cluster.start"), e);
}
}
} finally {
@@ -664,7 +664,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
try {
((Lifecycle) oldRealm).stop();
} catch (LifecycleException e) {
- log.error("ContainerBase.setRealm: stop: ", e);
+ log.error(sm.getString("containerBase.realm.stop"), e);
}
}
@@ -676,7 +676,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
try {
((Lifecycle) realm).start();
} catch (LifecycleException e) {
- log.error("ContainerBase.setRealm: start: ", e);
+ log.error(sm.getString("containerBase.realm.start"), e);
}
}
@@ -722,13 +722,14 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
private void addChildInternal(Container child) {
- if( log.isDebugEnabled() )
+ if (log.isDebugEnabled()) {
log.debug("Add child " + child + " " + this);
+ }
+
synchronized(children) {
if (children.get(child.getName()) != null)
- throw new IllegalArgumentException("addChild: Child name '" +
- child.getName() +
- "' is not unique");
+ throw new IllegalArgumentException(
+ sm.getString("containerBase.child.notUnique",
child.getName()));
child.setParent(this); // May throw IAE
children.put(child.getName(), child);
}
@@ -744,7 +745,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
}
} catch (LifecycleException e) {
log.error("ContainerBase.addChild: start: ", e);
- throw new IllegalStateException("ContainerBase.addChild: start: "
+ e);
+ throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
} finally {
fireContainerEvent(ADD_CHILD_EVENT, child);
}
@@ -834,7 +835,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
child.stop();
}
} catch (LifecycleException e) {
- log.error("ContainerBase.removeChild: stop: ", e);
+ log.error(sm.getString("containerBase.child.stop"), e);
}
try {
@@ -845,7 +846,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
child.destroy();
}
} catch (LifecycleException e) {
- log.error("ContainerBase.removeChild: destroy: ", e);
+ log.error(sm.getString("containerBase.child.destroy"), e);
}
synchronized(children) {
@@ -948,7 +949,6 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
((Lifecycle) pipeline).start();
}
-
setState(LifecycleState.STARTING);
// Start our thread
@@ -1387,11 +1387,11 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log.error("Exception invoking periodic operation: ", t);
+
log.error(sm.getString("containerBase.backgroundProcess.error"), t);
} finally {
if (container instanceof Context) {
((Context) container).unbind(false, originalClassLoader);
- }
+ }
}
}
}
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 242bd7c..14fe743 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -109,10 +109,19 @@ asyncContextImpl.requestEnded=The request associated with
the AsyncContext has a
asyncContextImpl.response.ise=It is illegal to call getResponse() after
complete() or any of the dispatch() methods has been called
containerBase.backgroundProcess.cluster=Exception processing cluster [{0}]
background process
+containerBase.backgroundProcess.error=Exception processing background thread
containerBase.backgroundProcess.realm=Exception processing realm [{0}]
background process
containerBase.backgroundProcess.unexpectedThreadDeath=Unexpected death of
background thread [{0}]
containerBase.backgroundProcess.valve=Exception processing valve [{0}]
background process
+containerBase.child.destroy=Error destroying child
+containerBase.child.notUnique=Child name [{0}] is not unique
+containerBase.child.start=Error starting child
+containerBase.child.stop=Error stopping child
+containerBase.cluster.start=Error starting new cluster
+containerBase.cluster.stop=Error stopping old cluster
containerBase.nullName=Container name cannot be null
+containerBase.realm.start=Error starting new realm
+containerBase.realm.stop=Error stopping old realm
containerBase.threadedStartFailed=A child container failed during start
containerBase.threadedStopFailed=A child container failed during stop
diff --git a/java/org/apache/catalina/core/LocalStrings_de.properties
b/java/org/apache/catalina/core/LocalStrings_de.properties
index 0c5aecd..fc39807 100644
--- a/java/org/apache/catalina/core/LocalStrings_de.properties
+++ b/java/org/apache/catalina/core/LocalStrings_de.properties
@@ -25,6 +25,7 @@ applicationFilterRegistration.nullInitParams=Kann
Initialisierungs Parameter fü
aprListener.initializingFIPS=FIPS-Modus wird initialisiert...
containerBase.backgroundProcess.cluster=Ausnahme beim Abarbeiten des Cluster
[{0}] Hintergrundprozesses
+containerBase.backgroundProcess.error=Während der Hintergrund Thread
abgearbeitet wurde trat eine Exception auf
containerBase.backgroundProcess.unexpectedThreadDeath=Unerwarteter Tod des
Hintergrund-Threads [{0}]
defaultInstanceManager.invalidInjection=Ungültige ressource injection
Annotation
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 3d37d8d..56ba3f0 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -108,10 +108,19 @@ asyncContextImpl.requestEnded=La requête associée avec
l'AsyncContext est déj
asyncContextImpl.response.ise=Il est illégal d'appeler getResponse() après que
complete() ou n'importe laquelle des méthodes de dispatch a été appelée
containerBase.backgroundProcess.cluster=Une exception s''est produite lors du
traitement d''arrière plan du cluster [{0}]
+containerBase.backgroundProcess.error=Exception durant le traitement du fil
d'arrière-plan
containerBase.backgroundProcess.realm=Exception lors du traitement d''arrière
plan du realm [{0}]
containerBase.backgroundProcess.unexpectedThreadDeath=Mort inattendue du fil
d''exécution d''arrière-plan ("background thread") [{0}]
containerBase.backgroundProcess.valve=Exception lors du traitement d''arrière
plan de la valve [{0}]
+containerBase.child.destroy=Erreur lors de la destruction du conteneur fils
+containerBase.child.notUnique=Le nom de conteneur fils [{0}] n''est pas unique
+containerBase.child.start=Erreur lors du démarrage du conteneur fils
+containerBase.child.stop=Erreur lors de l'arrêt du conteneur fils
+containerBase.cluster.start=Erreur lors du démarrage du nouveau cluster
+containerBase.cluster.stop=Erreur lors de l'arrêt de l'ancien cluster
containerBase.nullName=Le nom d'un conteneur ne peut être null
+containerBase.realm.start=Erreur lors du démarrage du nouveau royaume
+containerBase.realm.stop=Erreur lors de l'arrêt de l'ancien royaume
containerBase.threadedStartFailed=Un conteneur fils a échoué pendant son
démarrage
containerBase.threadedStopFailed=Erreur lors de l'arrêt d'un conteneur fils
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index a15636c..a48bc8c 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -108,10 +108,19 @@ asyncContextImpl.requestEnded=AsyncContextに関連付けられたリクエス
asyncContextImpl.response.ise=complete()、またはdispatch()メソッドのいずれかが呼び出された後での、不正なgetResponse()呼び出し。
containerBase.backgroundProcess.cluster=クラスター [{0}] でバックグランド処理を実行中に例外が発生しました。
+containerBase.backgroundProcess.error=バックグラウンドスレッド処理中の例外
containerBase.backgroundProcess.realm=Realm [{0}] のバックグラウンド処理中に例外が発生しました。
containerBase.backgroundProcess.unexpectedThreadDeath=バックグラウンドスレッド [{0}]
は予期せぬ理由で終了しました。
containerBase.backgroundProcess.valve=Valve [{0}] のバックグラウンドプロセス処理中の例外
+containerBase.child.destroy=子コンテナ破棄中のエラー
+containerBase.child.notUnique=子要素の名前 [{0}] が一意ではありません。
+containerBase.child.start=子要素を開始できません。
+containerBase.child.stop=子コンテナ停止時のエラー
+containerBase.cluster.start=新しいクラスターを開始できません。
+containerBase.cluster.stop=古いクラスターを停止できません。
containerBase.nullName=コンテナー名は null にできません。
+containerBase.realm.start=新しいRealmを開始できません。
+containerBase.realm.stop=古いRealmを停止できません。
containerBase.threadedStartFailed=子コンテナーを開始できません。
containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index c0b8343..bc2961a 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -108,10 +108,19 @@ asyncContextImpl.requestEnded=AsyncContext와 연관된 요청은 이미 처리
asyncContextImpl.response.ise=complete() 또는 어떤 종류의 dispatch() 메소드라도 호출된 이후에는,
getResponse()를 호출하는 것은 불허됩니다.
containerBase.backgroundProcess.cluster=클러스터 [{0}]을(를) 백그라운드 프로세스에서 처리하는 중 오류
발생
+containerBase.backgroundProcess.error=백그라운드 쓰레드를 처리하는 중 예외 발생
containerBase.backgroundProcess.realm=Realm [{0}]을(를) 백그라운드 프로세스에서 처리 중 예외 발생
containerBase.backgroundProcess.unexpectedThreadDeath=백그라운드 쓰레드 [{0}]이(가) 예기치
않게 종료되었습니다.
containerBase.backgroundProcess.valve=Valve [{0}]의 백그라운드 프로세스를 처리하는 중 예외 발생
+containerBase.child.destroy=자식 컨테이너를 소멸시키는 중 오류 발생
+containerBase.child.notUnique=자식 컨테이너 이름 [{0}]이(가) 유일하지 않습니다.
+containerBase.child.start=자식 컨테이너를 시작하는 중 오류 발생
+containerBase.child.stop=자식 컨테이너를 중지시키는 중 오류 발생
+containerBase.cluster.start=새로운 클러스터를 시작하는 중 오류 발생
+containerBase.cluster.stop=이전 클러스터를 중지시키는 중 오류 발생
containerBase.nullName=컨테이너 이름은 널일 수 없습니다.
+containerBase.realm.start=새로운 realm을 시작하는 중 오류 발생
+containerBase.realm.stop=이전 realm을 중지시키는 중 오류 발생
containerBase.threadedStartFailed=자식 컨테이너를 시작 중 실패했습니다.
containerBase.threadedStopFailed=자식 컨테이너가 중지되는 중 실패했습니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index f2d4cc3..4f487ae 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -109,10 +109,19 @@ asyncContextImpl.requestEnded=AsyncContext关联的请求已经完成处理。
asyncContextImpl.response.ise=调用complete()或者任何的dispatch()方法后，调用getResponse()方法是非法的。
containerBase.backgroundProcess.cluster=异常处理集群[{0}]后台进程
+containerBase.backgroundProcess.error=处理后台线程异常
containerBase.backgroundProcess.realm=异常处理领域[{0}]后台进程
containerBase.backgroundProcess.unexpectedThreadDeath=后台线程[{0}]意外结束
containerBase.backgroundProcess.valve=处理阀门[{0}]后台进程异常
+containerBase.child.destroy=销毁子级时出错
+containerBase.child.notUnique=子名称[{0}]不唯一
+containerBase.child.start=启动子级时出错
+containerBase.child.stop=停止子级时出错
+containerBase.cluster.start=启动新群集时出错
+containerBase.cluster.stop=停止旧群集时出错
containerBase.nullName=容器名称不能为null
+containerBase.realm.start=启动新领域时出错
+containerBase.realm.stop=停止旧域时出错
containerBase.threadedStartFailed=子容器启动失败
containerBase.threadedStopFailed=停止期间子容器失败
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
