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 2c7deb9 No functional change. Align 10.0.x, 9.0.x and 8.5.x
2c7deb9 is described below
commit 2c7deb91f72f2728bedee238bc08b9e67da70f61
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Mar 29 10:21:56 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/core/LocalStrings.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_fr.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_ja.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_ko.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_ru.properties | 1 +
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 3 +++
java/org/apache/catalina/core/StandardService.java | 6 +++---
java/org/apache/catalina/core/StandardWrapper.java | 9 ++++-----
java/org/apache/catalina/core/StandardWrapperValve.java | 2 ++
9 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 6c294cf..bf9f5ee 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -251,6 +251,8 @@ standardService.connector.startFailed=Failed to start
connector [{0}]
standardService.connector.stopFailed=Failed to stop connector [{0}]
standardService.engine.startFailed=Failed to start associated Engine
standardService.engine.stopFailed=Failed to stop associated Engine
+standardService.executor.start=Error starting new executor
+standardService.executor.stop=Error stopping old executor
standardService.mapperListener.startFailed=Failed to start associated
MapperListener
standardService.mapperListener.stopFailed=Failed to stop associated
MapperListener
standardService.start.name=Starting service [{0}]
@@ -264,6 +266,7 @@ standardWrapper.destroyInstance=InstanceManager.destroy()
for servlet [{0}] thre
standardWrapper.initException=Servlet.init() for servlet [{0}] threw exception
standardWrapper.instantiate=Error instantiating servlet class [{0}]
standardWrapper.isUnavailable=Servlet [{0}] is currently unavailable
+standardWrapper.jspMonitorError=Error registering JSP monitor Mbean [{0}]
standardWrapper.notChild=Wrapper container may not have child containers
standardWrapper.notClass=No servlet class has been specified for servlet [{0}]
standardWrapper.notContext=Parent container of a Wrapper must be a Context
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 55c45dc..0a96a71 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -245,6 +245,8 @@ standardServer.storeConfig.notAvailable=Aucune
implémentation de StoreConfig n'
standardService.engine.startFailed=Impossible de démarrer l'Engine associé
standardService.engine.stopFailed=Echec de l'arrêt du moteur associé
+standardService.executor.start=Erreur lors du démarrage du nouvel exécuteur
+standardService.executor.stop=Erreur lors de l'arrêt de l'ancien exécuteur
standardService.mapperListener.startFailed=Impossible de démarrer le
MapperListener associé
standardService.mapperListener.stopFailed=Impossible d'arrêter le
MapperListener associé
standardService.start.name=Démarrage du service [{0}]
@@ -258,6 +260,7 @@ standardWrapper.destroyInstance=InstanceManager.destroy()
pour le Servlet [{0}]
standardWrapper.initException="Servlet.init()" pour la servlet [{0}] a généré
une exception
standardWrapper.instantiate=Erreur à l''instantiation de la classe servlet
[{0}]
standardWrapper.isUnavailable=La servlet [{0}] est actuellement indisponible
+standardWrapper.jspMonitorError=Erreur de l'enregistrement du Mbean du
moniteur de JSP
standardWrapper.notChild=L'enrobeur de conteneur (wrapper container) ne peut
pas avoir de conteneurs fils
standardWrapper.notClass=Aucune classe servlet n''a été spécifiée pour la
servlet [{0}]
standardWrapper.notContext=Le conteneur parent d'un enrobeur (wrapper) doit
être un contexte
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 0d4846d..9989f7b 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -245,6 +245,8 @@
standardServer.storeConfig.notAvailable=StoreConfig実装は[{0}]という名前
standardService.engine.startFailed=関連付けられたEngineの起動に失敗しました
standardService.engine.stopFailed=関連付けられたEngineの停止に失敗しました。
+standardService.executor.start=新しいエグゼキュターを開始できません。
+standardService.executor.stop=古いエグゼキュターの停止中のエラー
standardService.mapperListener.startFailed=関連付けられたMapperListenerの起動に失敗しました。
standardService.mapperListener.stopFailed=関連付けられたMapperListenerの停止に失敗しました。
standardService.start.name=サービス [{0}] を起動します
@@ -258,6 +260,7 @@ standardWrapper.destroyInstance=サーブレット [{0}] の
InstanceManager.des
standardWrapper.initException=サーブレット [{0}] のServlet.init()が例外を投げました
standardWrapper.instantiate=サーブレットクラス [{0}] を初期化中のエラー
standardWrapper.isUnavailable=サーブレット [{0}] は現在利用できません
+standardWrapper.jspMonitorError=JSP 監視 MBean [{0}] 登録中のエラー
standardWrapper.notChild=Wrapper コンテナは子供のコンテナを持つことはできません
standardWrapper.notClass=サーブレット [{0}] に指定されたサーブレットクラスがありません
standardWrapper.notContext=Wrapper の親のコンテナはContextでなければいけません
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 3abed4c..209effd 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -245,6 +245,8 @@ standardServer.storeConfig.notAvailable=[{0}](이)라는 이름의
MBean으로
standardService.engine.startFailed=연관된 엔진을 시작하지 못했습니다.
standardService.engine.stopFailed=연관된 엔진을 중지시키지 못했습니다.
+standardService.executor.start=새로운 Executor를 시작하는 중 오류 발생
+standardService.executor.stop=이전 Executor를 중지시키는 중 오류 발생
standardService.mapperListener.startFailed=연관된 MapperListener를 시작하지 못했습니다.
standardService.mapperListener.stopFailed=연관된 MapperListener를 중지시키지 못했습니다.
standardService.start.name=서비스 [{0}]을(를) 시작합니다.
@@ -258,6 +260,7 @@ standardWrapper.destroyInstance=서블릿 [{0}]을(를) 위한
InstanceManager.d
standardWrapper.initException=서블릿 [{0}]을(를) 위한 Servlet.init() 호출이 예외를 발생시켰습니다.
standardWrapper.instantiate=서블릿 클래스 [{0}](으)로부터 인스턴스 생성하는 중 오류 발생
standardWrapper.isUnavailable=서블릿 [{0}]은(는) 현재 가용하지 않습니다.
+standardWrapper.jspMonitorError=JSP 모니터 MBean [{0}]을(를) 등록하는 중 오류 발생
standardWrapper.notChild=Wrapper 컨테이너는 자식 컨테이너들을 가질 수 없습니다.
standardWrapper.notClass=서블릿 [{0}]을(를) 위한 서블릿 클래스가 지정되지 않았습니다.
standardWrapper.notContext=Wrapper의 부모 컨테이너는 반드시 컨텍스트여야 합니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties
b/java/org/apache/catalina/core/LocalStrings_ru.properties
index e18d442..337fef3 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -32,6 +32,7 @@ standardWrapper.destroyInstance=InstanceManager.destroy() для
сервлет
standardWrapper.initException=Servlet.init() для сервлета [{0}] выбросил
исключение
standardWrapper.instantiate=Ошибка создания экземпляра класса сервлета [{0}]
standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
+standardWrapper.jspMonitorError=Ошибка регистрации JSP-монитора Mbean [{0}]
standardWrapper.notChild=Контейнер может не иметь дочерних контейнеров
standardWrapper.notClass=Для сервлета [{0}] не указан специальный класс
standardWrapper.notContext=Родительский контейнер обертки должен быть
контекстом
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 82fb949..6b3ae82 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -245,6 +245,8 @@ standardServer.storeConfig.notAvailable=没有将StoreConfig实现注册为名
standardService.engine.startFailed=启动关联的Engine失败
standardService.engine.stopFailed=失败停止关联的引擎
+standardService.executor.start=启动新执行器时出错
+standardService.executor.stop=停止旧执行器时出错
standardService.mapperListener.startFailed=无法启动关联的MapperListener
standardService.mapperListener.stopFailed=无法停止关联的MapperListener
standardService.start.name=正在启动服务[{0}]
@@ -258,6 +260,7 @@ standardWrapper.destroyInstance=servlet[{0}]实例管理销毁(destroy)
抛出
standardWrapper.initException=Servlet[{0}]的Servlet.init（）引发异常
standardWrapper.instantiate=实例化Servlet类[{0}]异常
standardWrapper.isUnavailable=Servlet [{0}]当前不可用。
+standardWrapper.jspMonitorError=注册JSP监视器Mbean[{0}]时出错
standardWrapper.notChild=Wrapper容器内部不允许有子容器。
standardWrapper.notClass=未为servlet[{0}]指定servlet类
standardWrapper.notContext=包装的父容器必须是上下文
diff --git a/java/org/apache/catalina/core/StandardService.java
b/java/org/apache/catalina/core/StandardService.java
index 9d6b0ee..2933780 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -85,7 +85,7 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
private final Object connectorsLock = new Object();
/**
- *
+ * The list of executors held by the service.
*/
protected final ArrayList<Executor> executors = new ArrayList<>();
@@ -344,7 +344,7 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
try {
ex.start();
} catch (LifecycleException x) {
- log.error("Executor.start", x);
+
log.error(sm.getString("standardService.executor.start"), x);
}
}
}
@@ -394,7 +394,7 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
try {
ex.stop();
} catch (LifecycleException e) {
- log.error("Executor.stop", e);
+ log.error(sm.getString("standardService.executor.stop"),
e);
}
}
}
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index 62fc55a..d233568 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Set;
import java.util.Stack;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -554,7 +555,7 @@ public class StandardWrapper extends ContainerBase
return DEFAULT_SERVLET_METHODS;
}
- HashSet<String> allow = new HashSet<>();
+ Set<String> allow = new HashSet<>();
allow.add("TRACE");
allow.add("OPTIONS");
@@ -576,7 +577,6 @@ public class StandardWrapper extends ContainerBase
String[] methodNames = new String[allow.size()];
return allow.toArray(methodNames);
-
}
@@ -608,7 +608,6 @@ public class StandardWrapper extends ContainerBase
// --------------------------------------------------------- Public Methods
-
/**
* Execute a periodic task, such as reloading, etc. This method will be
* invoked inside the classloading context of this container. Unexpected
@@ -1004,7 +1003,7 @@ public class StandardWrapper extends ContainerBase
jspMonitorON = new ObjectName(oname.toString());
Registry.getRegistry(null, null).registerComponent(instance,
jspMonitorON, null);
} catch (Exception ex) {
- log.warn("Error registering JSP monitoring with jmx " +
instance);
+ log.warn(sm.getString("standardWrapper.jspMonitorError",
instance));
}
}
}
@@ -1154,7 +1153,7 @@ public class StandardWrapper extends ContainerBase
throw f;
} catch (Throwable f) {
ExceptionUtils.handleThrowable(f);
- getServletContext().log("StandardWrapper.Throwable", f );
+
getServletContext().log(sm.getString("standardWrapper.initException",
getName()), f);
// If the servlet wanted to be unavailable it would have
// said so, so do not call unavailable(null).
throw new ServletException
diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java
b/java/org/apache/catalina/core/StandardWrapperValve.java
index c7b7590..8d2f54b 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -29,6 +29,7 @@ import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServletResponse;
+import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.LifecycleException;
@@ -174,6 +175,7 @@ final class StandardWrapperValve
// Call the filter chain for this request
// NOTE: This also calls the servlet's service() method
+ Container container = this.container;
try {
if ((servlet != null) && (filterChain != null)) {
// Swallow output if needed
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
