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 a532333 No functional change. Align 10.0.x, 9.0.x and 8.5.x
a532333 is described below
commit a5323332f45630d41996f20574529392f690f3e4
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Mar 29 10:45:14 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
.../apache/catalina/core/LocalStrings.properties | 3 +++
.../catalina/core/LocalStrings_fr.properties | 3 +++
.../catalina/core/LocalStrings_ja.properties | 3 +++
.../catalina/core/LocalStrings_ko.properties | 3 +++
.../catalina/core/LocalStrings_zh_CN.properties | 3 +++
.../catalina/core/StandardThreadExecutor.java | 22 ++++++++++++++++------
6 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index bf9f5ee..e4a9874 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -258,6 +258,9 @@ standardService.mapperListener.stopFailed=Failed to stop
associated MapperListen
standardService.start.name=Starting service [{0}]
standardService.stop.name=Stopping service [{0}]
+standardThreadExecutor.notStarted=The executor has not been started
+standardThreadExecutor.queueFull=The executor's work queue is full
+
standardWrapper.allocate=Error allocating a servlet instance
standardWrapper.allocateException=Allocate exception for servlet [{0}]
standardWrapper.deallocateException=Deallocate exception for servlet [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 0a96a71..71395c8 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -252,6 +252,9 @@ standardService.mapperListener.stopFailed=Impossible
d'arrêter le MapperListene
standardService.start.name=Démarrage du service [{0}]
standardService.stop.name=Arrêt du service [{0}]
+standardThreadExecutor.notStarted=L'exécuteur n'a pas encore été démarré
+standardThreadExecutor.queueFull=La file de travail de l'exécuteur est pleine
+
standardWrapper.allocate=Erreur d'allocation à une instance de servlet
standardWrapper.allocateException=Exception lors de l''allocation pour la
servlet [{0}]
standardWrapper.deallocateException=Exception à la désallocation pour la
servlet [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 9989f7b..6ed2c6b 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -252,6 +252,9 @@
standardService.mapperListener.stopFailed=関連付けられたMapperListenerの
standardService.start.name=サービス [{0}] を起動します
standardService.stop.name=サービス [{0}] を停止します
+standardThreadExecutor.notStarted=エグゼキュターは開始ししていません。
+standardThreadExecutor.queueFull=エグゼキュターの作業キューは満杯です。
+
standardWrapper.allocate=サーブレットインスタンスを割り当て中のエラーです
standardWrapper.allocateException=サーブレット [{0}] に例外を割り当てます
standardWrapper.deallocateException=サーブレット [{0}] に対する例外の割り当てを解除します
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 209effd..942f4b4 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -252,6 +252,9 @@ standardService.mapperListener.stopFailed=연관된
MapperListener를 중지시
standardService.start.name=서비스 [{0}]을(를) 시작합니다.
standardService.stop.name=서비스 [{0}]을(를) 중지시킵니다.
+standardThreadExecutor.notStarted=Executor가 아직 시작되지 않았습니다.
+standardThreadExecutor.queueFull=해당 Executor의 작업 큐가 꽉 찼습니다.
+
standardWrapper.allocate=서블릿 인스턴스를 할당하는 중 오류 발생
standardWrapper.allocateException=서블릿 [{0}]을(를) 위해 할당하던 중 예외 발생
standardWrapper.deallocateException=서블릿 [{0}]을(를) 위한 할당 해제 처리 중 예외 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 6b3ae82..b9d3c66 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -252,6 +252,9 @@
standardService.mapperListener.stopFailed=无法停止关联的MapperListener
standardService.start.name=正在启动服务[{0}]
standardService.stop.name=正在停止服务[{0}]
+standardThreadExecutor.notStarted=执行器尚未启动
+standardThreadExecutor.queueFull=执行者的工作队列已满
+
standardWrapper.allocate=分配一个servlet实例错误
standardWrapper.allocateException=分配异常的servlet [{0}]
standardWrapper.deallocateException=servlet[{0}]的解除分配异常
diff --git a/java/org/apache/catalina/core/StandardThreadExecutor.java
b/java/org/apache/catalina/core/StandardThreadExecutor.java
index 4ff1d9d..9ab3e7d 100644
--- a/java/org/apache/catalina/core/StandardThreadExecutor.java
+++ b/java/org/apache/catalina/core/StandardThreadExecutor.java
@@ -24,6 +24,7 @@ import org.apache.catalina.Executor;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.util.LifecycleMBeanBase;
+import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.threads.ResizableExecutor;
import org.apache.tomcat.util.threads.TaskQueue;
import org.apache.tomcat.util.threads.TaskThreadFactory;
@@ -32,6 +33,9 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
public class StandardThreadExecutor extends LifecycleMBeanBase
implements Executor, ResizableExecutor {
+ protected static final StringManager sm =
+ StringManager.getManager(Constants.Package);
+
// ---------------------------------------------- Properties
/**
* Default thread priority
@@ -140,7 +144,9 @@ public class StandardThreadExecutor extends
LifecycleMBeanBase
protected void stopInternal() throws LifecycleException {
setState(LifecycleState.STOPPING);
- if ( executor != null ) executor.shutdownNow();
+ if (executor != null) {
+ executor.shutdownNow();
+ }
executor = null;
taskqueue = null;
}
@@ -154,24 +160,28 @@ public class StandardThreadExecutor extends
LifecycleMBeanBase
@Override
public void execute(Runnable command, long timeout, TimeUnit unit) {
- if ( executor != null ) {
+ if (executor != null) {
executor.execute(command,timeout,unit);
} else {
- throw new IllegalStateException("StandardThreadExecutor not
started.");
+ throw new
IllegalStateException(sm.getString("standardThreadExecutor.notStarted"));
}
}
@Override
public void execute(Runnable command) {
- if ( executor != null ) {
+ if (executor != null) {
try {
executor.execute(command);
} catch (RejectedExecutionException rx) {
//there could have been contention around the queue
- if ( !( (TaskQueue) executor.getQueue()).force(command) )
throw new RejectedExecutionException("Work queue full.");
+ if (!((TaskQueue) executor.getQueue()).force(command)) {
+ throw new
RejectedExecutionException(sm.getString("standardThreadExecutor.queueFull"));
+ }
}
- } else throw new IllegalStateException("StandardThreadPool not
started.");
+ } else {
+ throw new
IllegalStateException(sm.getString("standardThreadExecutor.notStarted"));
+ }
}
public void contextStopping() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
