[tomcat] branch 8.5.x updated: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 8dab9ba No functional change. Align 10.0.x, 9.0.x and 8.5.x
8dab9ba is described below
commit 8dab9ba23e93651db0e5636c4160603a7356babe
Author: Mark Thomas
AuthorDate: Mon Mar 29 19:54:25 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/jasper/JspC.java | 20 +---
.../apache/jasper/resources/LocalStrings.properties | 7 +++
.../jasper/resources/LocalStrings_de.properties | 2 ++
.../jasper/resources/LocalStrings_fr.properties | 7 +++
.../jasper/resources/LocalStrings_ja.properties | 7 +++
.../jasper/resources/LocalStrings_ko.properties | 7 +++
.../jasper/resources/LocalStrings_zh_CN.properties | 7 +++
.../apache/jasper/servlet/JspCServletContext.java| 2 +-
8 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index ae9fb24..03f234f 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -420,8 +420,7 @@ public class JspC extends Task implements Options {
setThreadCount(nextArg());
} else {
if (tok.startsWith("-")) {
-throw new JasperException("Unrecognized option: " + tok +
-". Use -help for help.");
+throw new
JasperException(Localizer.getMessage("jspc.error.unknownOption", tok));
}
if (!fullstop) {
argPos--;
@@ -451,9 +450,6 @@ public class JspC extends Task implements Options {
return true;
}
-/**
- * {@inheritDoc}
- */
@Override
public boolean getTrimSpaces() {
return trimSpaces;
@@ -979,10 +975,11 @@ public class JspC extends Task implements Options {
newThreadCount = Integer.parseInt(threadCount);
}
} catch (NumberFormatException e) {
-throw new BuildException("Couldn't parse thread count: " +
threadCount);
+throw new
BuildException(Localizer.getMessage("jspc.error.parseThreadCount",
threadCount));
}
if (newThreadCount < 1) {
-throw new BuildException("There must be at least one thread: " +
newThreadCount);
+throw new BuildException(Localizer.getMessage(
+"jspc.error.minThreadCount",
Integer.valueOf(newThreadCount)));
}
this.threadCount = newThreadCount;
}
@@ -1523,7 +1520,7 @@ public class JspC extends Task implements Options {
}
} else {
errorCount++;
-log.error(e.getMessage());
+
log.error(Localizer.getMessage("jspc.error.compilation"), e);
}
} catch (InterruptedException e) {
// Ignore
@@ -1540,6 +1537,8 @@ public class JspC extends Task implements Options {
String msg = Localizer.getMessage("jspc.generation.result",
Integer.toString(errorCount), Long.toString(time));
if (failOnError && errorCount > 0) {
+System.out.println(Localizer.getMessage(
+"jspc.errorCount", Integer.valueOf(errorCount)));
throw new BuildException(msg);
} else {
log.info(msg);
@@ -1695,7 +1694,7 @@ public class JspC extends Task implements Options {
}
// Turn the classPath into URLs
-ArrayList urls = new ArrayList<>();
+List urls = new ArrayList<>();
StringTokenizer tokenizer = new StringTokenizer(classPath,
File.pathSeparator);
while (tokenizer.hasMoreTokens()) {
@@ -1735,8 +1734,7 @@ public class JspC extends Task implements Options {
String ext = lib.substring(lib.length() - 4);
if (!".jar".equalsIgnoreCase(ext)) {
if (".tld".equalsIgnoreCase(ext)) {
-log.warn("TLD files should not be placed in "
- + "/WEB-INF/lib");
+
log.warn(Localizer.getMessage("jspc.warning.tldInWebInfLib"));
}
continue;
}
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 96a8c8c..c5ed7fe 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++
[tomcat] branch 8.5.x updated: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 4be404e No functional change. Align 10.0.x, 9.0.x and 8.5.x
4be404e is described below
commit 4be404e5b2246991a1e95e021182853686bd0e23
Author: Mark Thomas
AuthorDate: Mon Mar 29 16:48:41 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
.../apache/jasper/compiler/JavacErrorDetail.java | 2 +-
.../apache/jasper/compiler/JspDocumentParser.java | 5 +--
java/org/apache/jasper/compiler/JspReader.java | 2 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 5 +--
java/org/apache/jasper/compiler/JspUtil.java | 46 --
.../apache/jasper/compiler/ParserController.java | 2 +-
.../apache/jasper/compiler/TagFileProcessor.java | 7 ++--
.../jasper/resources/LocalStrings.properties | 3 ++
.../jasper/resources/LocalStrings_de.properties| 2 +
.../jasper/resources/LocalStrings_fr.properties| 3 ++
.../jasper/resources/LocalStrings_ja.properties| 3 ++
.../jasper/resources/LocalStrings_ko.properties| 3 ++
.../jasper/resources/LocalStrings_zh_CN.properties | 3 ++
13 files changed, 35 insertions(+), 51 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JavacErrorDetail.java
b/java/org/apache/jasper/compiler/JavacErrorDetail.java
index 1321afc..d62d81c 100644
--- a/java/org/apache/jasper/compiler/JavacErrorDetail.java
+++ b/java/org/apache/jasper/compiler/JavacErrorDetail.java
@@ -118,7 +118,7 @@ public class JavacErrorDetail {
String javaLine = javaLines[javaLineNum-1].trim();
for (int i=jspBeginLineNum-1; i temp = new Vector<>(tempLength, 1);
+ArrayList temp = new ArrayList<>(tempLength);
for (int i = 0; i < tempLength; i++) {
@SuppressWarnings("null") // If attrs==null, tempLength == 0
String qName = attrs.getQName(i);
if ((!qName.equals("xmlns")) && (!qName.startsWith("xmlns:"))) {
-temp.addElement(qName);
+temp.add(qName);
}
}
@@ -143,7 +143,7 @@ public class JspUtil {
Node node = tagBody.getNode(i);
if (node instanceof Node.NamedAttribute) {
String attrName = node.getAttributeValue("name");
-temp.addElement(attrName);
+temp.add(attrName);
// Check if this value appear in the attribute of the node
if (n.getAttributeValue(attrName) != null) {
err.jspError(n,
@@ -325,7 +325,7 @@ public class JspUtil {
c = double.class;
} else if ("void".equals(type)) {
c = void.class;
-} else if (type.indexOf('[') < 0) {
+} else {
c = loader.loadClass(type);
}
@@ -768,7 +768,7 @@ public class JspUtil {
* @return Java package corresponding to the given path
*/
public static final String makeJavaPackage(String path) {
-String classNameComponents[] = split(path, "/");
+String classNameComponents[] = path.split("/");
StringBuilder legalClassNames = new StringBuilder();
for (String classNameComponent : classNameComponents) {
if (classNameComponent.length() > 0) {
@@ -782,37 +782,6 @@ public class JspUtil {
}
/**
- * Splits a string into it's components.
- *
- * @param path
- *String to split
- * @param pat
- *Pattern to split at
- * @return the components of the path
- */
-private static final String[] split(String path, String pat) {
-Vector comps = new Vector<>();
-int pos = path.indexOf(pat);
-int start = 0;
-while (pos >= 0) {
-if (pos > start) {
-String comp = path.substring(start, pos);
-comps.add(comp);
-}
-start = pos + pat.length();
-pos = path.indexOf(pat, start);
-}
-if (start < path.length()) {
-comps.add(path.substring(start));
-}
-String[] result = new String[comps.size()];
-for (int i = 0; i < comps.size(); i++) {
-result[i] = comps.elementAt(i);
-}
-return result;
-}
-
-/**
* Converts the given identifier to a legal Java identifier
*
* @param identifier
@@ -991,8 +960,7 @@ public class JspUtil {
if (t == null) {
// Should never happen
-throw new IllegalArgumentException("Unable to extract type from ["
+
-type + "]");
+throw new
IllegalArgumentException(Localizer.getMessage("jsp.error.unable.getType",
type));
}
StringBuilder resultType = new
[tomcat] branch 8.5.x updated: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 ea79f05 No functional change. Align 10.0.x, 9.0.x and 8.5.x
ea79f05 is described below
commit ea79f05f25db4560dd34eaf5bdb39fa6338d9212
Author: Mark Thomas
AuthorDate: Mon Mar 29 16:33:11 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/jasper/compiler/JDTCompiler.java | 8
java/org/apache/jasper/resources/LocalStrings.properties | 3 +++
java/org/apache/jasper/resources/LocalStrings_de.properties| 1 +
java/org/apache/jasper/resources/LocalStrings_fr.properties| 3 +++
java/org/apache/jasper/resources/LocalStrings_ja.properties| 3 +++
java/org/apache/jasper/resources/LocalStrings_ko.properties| 3 +++
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 3 +++
7 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index c0b39a1..510db1a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -145,7 +145,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
result = new char[buf.length()];
buf.getChars(0, result.length, result, 0);
} catch (IOException e) {
-log.error("Compilation error", e);
+
log.error(Localizer.getMessage("jsp.error.compilation.source", sourceFile), e);
}
return result;
}
@@ -232,7 +232,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
return new NameEnvironmentAnswer(classFileReader,
null);
}
} catch (IOException | ClassFormatException exc) {
-log.error("Compilation error", exc);
+
log.error(Localizer.getMessage("jsp.error.compilation.dependent", className),
exc);
}
return null;
}
@@ -465,7 +465,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
(name, pageNodes, new
StringBuilder(problem.getMessage()),
problem.getSourceLineNumber(), ctxt));
} catch (JasperException e) {
-log.error("Error visiting node", e);
+
log.error(Localizer.getMessage("jsp.error.compilation.jdtProblemError"), e);
}
}
}
@@ -491,7 +491,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
}
}
} catch (IOException exc) {
-log.error("Compilation error", exc);
+
log.error(Localizer.getMessage("jsp.error.compilation.jdt"), exc);
}
}
};
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 4fd82ec..ad38f8b 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -46,6 +46,9 @@ jsp.error.bug48498=Unable to display JSP extract. Probably
due to an XML parser
jsp.error.classname=Cannot determine classname from .class file
jsp.error.coerce_to_type=Cannot coerce value [{2}] to type [{1}] for attribute
[{0}].
jsp.error.compilation=Error compiling file: [{0}] [{1}]
+jsp.error.compilation.jdt=Compilation error
+jsp.error.compilation.jdtProblemError=Error processing JDT problems list
+jsp.error.compilation.source=Error loading source file [{0}]
jsp.error.compiler=No Java compiler available
jsp.error.compiler.config=No Java compiler available for configuration options
compilerClassName: [{0}] and compiler: [{1}]
jsp.error.config_pagedir_encoding_mismatch=Page-encoding specified in
jsp-property-group [{0}] is different from that specified in page directive
[{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 56b5be5..2fbc268 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -20,6 +20,7 @@ jsp.error.attribute.deferredmix=Kann nicht ${} und #{}
gleichzeitig als EL Ausdr
jsp.error.attribute.duplicate=Qualifizierte Attributnamen müssen innerhalb
eines
[tomcat] branch 8.5.x updated: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 d112d80 No functional change. Align 10.0.x, 9.0.x and 8.5.x
d112d80 is described below
commit d112d806b8a741e0d08ddd0a8f811aaa478c2745
Author: Mark Thomas
AuthorDate: Mon Mar 29 16:11:26 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/jasper/compiler/ELFunctionMapper.java| 3 ++-
java/org/apache/jasper/compiler/ErrorDispatcher.java | 3 ++-
java/org/apache/jasper/compiler/Generator.java | 16 +---
java/org/apache/jasper/resources/LocalStrings.properties | 1 +
.../apache/jasper/resources/LocalStrings_de.properties | 1 +
.../apache/jasper/resources/LocalStrings_fr.properties | 1 +
.../apache/jasper/resources/LocalStrings_ja.properties | 1 +
.../apache/jasper/resources/LocalStrings_ko.properties | 1 +
.../jasper/resources/LocalStrings_zh_CN.properties | 1 +
9 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/jasper/compiler/ELFunctionMapper.java
b/java/org/apache/jasper/compiler/ELFunctionMapper.java
index 58af9f8..2bd2d71 100644
--- a/java/org/apache/jasper/compiler/ELFunctionMapper.java
+++ b/java/org/apache/jasper/compiler/ELFunctionMapper.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.servlet.jsp.tagext.FunctionInfo;
@@ -81,7 +82,7 @@ public class ELFunctionMapper {
* Use a global name map to facilitate reuse of function maps.
* The key used is prefix:function:uri.
*/
-private final HashMap gMap = new HashMap<>();
+private final Map gMap = new HashMap<>();
@Override
public void visit(Node.ParamAction n) throws JasperException {
diff --git a/java/org/apache/jasper/compiler/ErrorDispatcher.java
b/java/org/apache/jasper/compiler/ErrorDispatcher.java
index f9bf3b3..2ecc675 100644
--- a/java/org/apache/jasper/compiler/ErrorDispatcher.java
+++ b/java/org/apache/jasper/compiler/ErrorDispatcher.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.net.MalformedURLException;
import java.util.ArrayList;
+import java.util.List;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
@@ -316,7 +317,7 @@ public class ErrorDispatcher {
String errMsg, String fname, Node.Nodes page)
throws IOException, JasperException {
-ArrayList errors = new ArrayList<>();
+List errors = new ArrayList<>();
StringBuilder errMsgBuf = null;
int lineNum = -1;
JavacErrorDetail javacError = null;
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index ef445da..b85c777 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1079,9 +1079,7 @@ class Generator {
String flush = n.getTextAttribute("flush");
Node.JspAttribute page = n.getPage();
-boolean isFlush = false; // default to false;
-if ("true".equals(flush))
-isFlush = true;
+boolean isFlush = "true".equals(flush);
n.setBeginJavaLine(out.getJavaLine());
@@ -3416,11 +3414,7 @@ class Generator {
} else if (n instanceof Node.NamedAttribute) {
ci = ((Node.NamedAttribute) n).getChildInfo();
} else {
-// Cannot access err since this method is static, but at
-// least flag an error.
-throw new JasperException("Unexpected Node Type");
-// err.getString(
-// "jsp.error.internal.unexpected_node_type" ) );
+throw new
JasperException(Localizer.getMessage("jsp.error.internal.unexpectedNodeType"));
}
if (ci.hasUseBean()) {
@@ -3632,8 +3626,8 @@ class Generator {
String className = tagInfo.getTagClassName();
int lastIndex = className.lastIndexOf('.');
if (lastIndex != -1) {
-String pkgName = className.substring(0, lastIndex);
-genPreamblePackage(pkgName);
+String packageName = className.substring(0, lastIndex);
+genPreamblePackage(packageName);
className = className.substring(lastIndex + 1);
}
@@ -4211,7 +4205,7 @@ class Generator {
// True if the helper class should be generated.
private boolean used = false;
-private ArrayList fragments = new ArrayList<>();
+private List fragments = new ArrayList<>();
private String className;
diff --git
[tomcat] branch 8.5.x updated: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 f2b1280 No functional change. Align 10.0.x, 9.0.x and 8.5.x
f2b1280 is described below
commit f2b1280ca1a31aa96353c8646da8dae72f52c47f
Author: Mark Thomas
AuthorDate: Mon Mar 29 14:02:15 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/Globals.java | 1 -
java/org/apache/catalina/Loader.java | 8
java/org/apache/catalina/TomcatPrincipal.java | 1 -
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index 52a9f96..f1d2815 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -95,7 +95,6 @@ public final class Globals {
/**
- * The subject under which the AccessControlContext is running.
* The request attribute that is set to the value of {@code Boolean.TRUE}
* by the RemoteIpFilter, RemoteIpValve (and other similar components)
that identifies
* a request which been forwarded via one or more proxies.
diff --git a/java/org/apache/catalina/Loader.java
b/java/org/apache/catalina/Loader.java
index dfe2461..b14deb5 100644
--- a/java/org/apache/catalina/Loader.java
+++ b/java/org/apache/catalina/Loader.java
@@ -96,7 +96,11 @@ public interface Loader {
/**
* @return the reloadable flag for this Loader.
+ *
+ * @deprecated Use {@link Context#getReloadable()}. This method will be
+ * removed in Tomcat 10.
*/
+@Deprecated
public boolean getReloadable();
@@ -104,7 +108,11 @@ public interface Loader {
* Set the reloadable flag for this Loader.
*
* @param reloadable The new reloadable flag
+ *
+ * @deprecated Use {@link Context#setReloadable(boolean)}. This method will
+ * be removed in Tomcat 10.
*/
+@Deprecated
public void setReloadable(boolean reloadable);
diff --git a/java/org/apache/catalina/TomcatPrincipal.java
b/java/org/apache/catalina/TomcatPrincipal.java
index 4d5dad6..6a5ffae 100644
--- a/java/org/apache/catalina/TomcatPrincipal.java
+++ b/java/org/apache/catalina/TomcatPrincipal.java
@@ -44,7 +44,6 @@ public interface TomcatPrincipal extends Principal {
* to allow for future expansion of this method to cover
* other logout mechanisms that might throw a different
* exception to LoginContext
- *
*/
void logout() throws Exception;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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
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
[tomcat] branch 8.5.x updated: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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
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=古いエグゼキュターの停止中のエラー
