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 <[email protected]>
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<jspLines.length; i++) {
-                            if (jspLines[i].indexOf(javaLine) != -1) {
+                            if (jspLines[i].contains(javaLine)) {
                                 // Update jsp line number
                                 jspBeginLineNum = i+1;
                                 break;
diff --git a/java/org/apache/jasper/compiler/JspDocumentParser.java 
b/java/org/apache/jasper/compiler/JspDocumentParser.java
index 11d43f1..b40ba76 100644
--- a/java/org/apache/jasper/compiler/JspDocumentParser.java
+++ b/java/org/apache/jasper/compiler/JspDocumentParser.java
@@ -648,7 +648,7 @@ class JspDocumentParser
 
         if (current instanceof Node.NamedAttribute) {
             boolean isTrim = ((Node.NamedAttribute)current).isTrim();
-            Node.Nodes subElems = ((Node.NamedAttribute)current).getBody();
+            Node.Nodes subElems = current.getBody();
             for (int i = 0; subElems != null && i < subElems.size(); i++) {
                 Node subElem = subElems.getNode(i);
                 if (!(subElem instanceof Node.TemplateText)) {
@@ -735,8 +735,7 @@ class JspDocumentParser
             startMark = new Mark(ctxt, path, locator.getLineNumber(),
                     locator.getColumnNumber());
             @SuppressWarnings("unused")
-            Node unused = new Node.Comment(
-                    new String(buf, offset, len), startMark, current);
+            Node unused = new Node.Comment(new String(buf, offset, len), 
startMark, current);
         }
     }
 
diff --git a/java/org/apache/jasper/compiler/JspReader.java 
b/java/org/apache/jasper/compiler/JspReader.java
index 55ea7d1..d191df0 100644
--- a/java/org/apache/jasper/compiler/JspReader.java
+++ b/java/org/apache/jasper/compiler/JspReader.java
@@ -118,7 +118,7 @@ class JspReader {
             current = new Mark(this, caw.toCharArray(), fname);
         } catch (Throwable ex) {
             ExceptionUtils.handleThrowable(ex);
-            log.error("Exception parsing file ", ex);
+            log.error(Localizer.getMessage("jsp.error.file.cannot.read", 
fname), ex);
             err.jspError("jsp.error.file.cannot.read", fname);
         } finally {
             if (reader != null) {
diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java 
b/java/org/apache/jasper/compiler/JspRuntimeContext.java
index 8cb924c..88798b9 100644
--- a/java/org/apache/jasper/compiler/JspRuntimeContext.java
+++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -381,8 +381,7 @@ public final class JspRuntimeContext {
                     ctxt.incrementRemoved();
                 } catch (Throwable t) {
                     ExceptionUtils.handleThrowable(t);
-                    jsw.getServletContext().log("Background compile failed",
-                                                t);
+                    
jsw.getServletContext().log(Localizer.getMessage("jsp.error.backgroundCompilationFailed"),
 t);
                 }
             }
         }
@@ -405,7 +404,7 @@ public final class JspRuntimeContext {
                     jsw.getServlet();
                 }
             } catch (ServletException e) {
-                jsw.getServletContext().log("Servlet reload failed", e);
+                
jsw.getServletContext().log(Localizer.getMessage("jsp.error.reload"), e);
             }
         }
     }
diff --git a/java/org/apache/jasper/compiler/JspUtil.java 
b/java/org/apache/jasper/compiler/JspUtil.java
index b077113..9d723e9 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import org.apache.jasper.Constants;
 import org.apache.jasper.JasperException;
@@ -126,12 +126,12 @@ public class JspUtil {
 
         // AttributesImpl.removeAttribute is broken, so we do this...
         int tempLength = (attrs == null) ? 0 : attrs.getLength();
-        Vector<String> temp = new Vector<>(tempLength, 1);
+        ArrayList<String> 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<String> 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 StringBuilder(t);
diff --git a/java/org/apache/jasper/compiler/ParserController.java 
b/java/org/apache/jasper/compiler/ParserController.java
index f398ebb..fcfe60d 100644
--- a/java/org/apache/jasper/compiler/ParserController.java
+++ b/java/org/apache/jasper/compiler/ParserController.java
@@ -238,7 +238,7 @@ class ParserController implements TagConstants {
         } else {
             // Standard syntax
             try (InputStreamReader inStreamReader = JspUtil.getReader(
-                    absFileName, sourceEnc, jar, ctxt, err, skip);) {
+                    absFileName, sourceEnc, jar, ctxt, err, skip)) {
                 JspReader jspReader = new JspReader(ctxt, absFileName,
                         inStreamReader, err);
                 parsedPage = Parser.parse(this, jspReader, parent, isTagFile,
diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java 
b/java/org/apache/jasper/compiler/TagFileProcessor.java
index 7482a14..7be773d 100644
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -19,6 +19,7 @@ package org.apache.jasper.compiler;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Vector;
 
@@ -127,9 +128,9 @@ class TagFileProcessor {
 
         private static final String TAG_DYNAMIC = "the dynamic-attributes 
attribute of the tag directive";
 
-        private HashMap<String,NameEntry> nameTable = new HashMap<>();
+        private Map<String,NameEntry> nameTable = new HashMap<>();
 
-        private HashMap<String,NameEntry> nameFromTable = new HashMap<>();
+        private Map<String,NameEntry> nameFromTable = new HashMap<>();
 
         public TagFileDirectiveVisitor(Compiler compiler,
                 TagLibraryInfo tagLibInfo, String name, String path) {
@@ -422,7 +423,7 @@ class TagFileProcessor {
         private void checkUniqueName(String name, String type, Node n,
                 TagAttributeInfo attr) throws JasperException {
 
-            HashMap<String, NameEntry> table = (VAR_NAME_FROM.equals(type)) ? 
nameFromTable : nameTable;
+            Map<String, NameEntry> table = (VAR_NAME_FROM.equals(type)) ? 
nameFromTable : nameTable;
             NameEntry nameEntry = table.get(name);
             if (nameEntry != null) {
                 if (!TAG_DYNAMIC.equals(type) ||
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index ad38f8b..60fc4ad 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -31,6 +31,7 @@ jsp.error.attribute.nowhitespace=The JSP specification 
requires that an attribut
 jsp.error.attribute.null_name=Null attribute name
 jsp.error.attribute.standard.non_rt_with_expr=The [{0}] attribute of the [{1}] 
standard action does not accept any expressions
 jsp.error.attribute.unterminated=attribute value for [{0}] is not properly 
terminated
+jsp.error.backgroundCompilationFailed=Background compilation failed
 jsp.error.bad.scratch.dir=The scratchDir you specified: [{0}] is unusable.
 jsp.error.badStandardAction=Invalid standard action
 jsp.error.bad_attribute=Attribute [{0}] invalid for tag [{1}] according to TLD
@@ -171,6 +172,7 @@ jsp.error.prefix.use_before_dcl=The prefix [{0}] specified 
in this tag directive
 jsp.error.prolog_config_encoding_mismatch=Page-encoding specified in XML 
prolog [{0}] is different from that specified in jsp-property-group [{1}]
 jsp.error.prolog_pagedir_encoding_mismatch=Page-encoding specified in XML 
prolog [{0}] is different from that specified in page directive [{1}]
 jsp.error.quotes.unterminated=Unterminated quotes
+jsp.error.reload=Servlet reload failed
 jsp.error.scripting.variable.missing_name=Unable to determine scripting 
variable name from attribute [{0}]
 jsp.error.security=Security initialization failed for context
 jsp.error.servlet.destroy.failed=Exception during Servlet.destroy() for JSP 
page
@@ -217,6 +219,7 @@ jsp.error.tlv.invalid.page=Validation error messages from 
TagLibraryValidator fo
 jsp.error.tlvclass.instantiation=Failed to load or instantiate 
TagLibraryValidator class: [{0}]
 jsp.error.unable.compile=Unable to compile class for JSP
 jsp.error.unable.deleteClassFile=Unable to delete class file [{0}]
+jsp.error.unable.getType=Unable to extract type from [{0}]
 jsp.error.unable.load=Unable to load class for JSP
 jsp.error.unable.renameClassFile=Unable to rename class file from [{0}] to 
[{1}]
 jsp.error.unable.to_find_method=Unable to find setter method for attribute: 
[{0}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties 
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 2fbc268..01088f9 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 Elements eindeutig sein
 jsp.error.attribute.noequal=Gleichheitszeichen erwartet
 jsp.error.attribute.nowhitespace=Die JSP Spezifikation verlangt, dass einem 
Attribut Namen ein Leerzeichen vorangeht.
+jsp.error.backgroundCompilationFailed=Die Hintergrundübersetzung schlug fehl.
 jsp.error.compilation.source=Fehler beim Laden der Quelldatei [{0}]
 jsp.error.compiler=Keine Java-Compiler verfügbar
 jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}]
@@ -44,6 +45,7 @@ jsp.error.noFunction=Die Funktion [{0}] kann mit dem 
angegebenen Prefix nicht ge
 jsp.error.not.in.template=[{0}] ist nicht im Body des Template Textes erlaubt
 jsp.error.outputfolder=kein Ausgabeordner
 jsp.error.parse.xml=Fehler bei der Verarbeitung der XML Datei [{0}]
+jsp.error.reload=Erneutes Laden des Servlets schlug fehl
 jsp.error.scripting.variable.missing_name=Kann den Namen der Skript Variable 
vom Attribut [{0}] ableiten
 jsp.error.simpletag.badbodycontent=Die TLD für Klasse [{0}] spezifiziert einen 
ungültigen Body-Content (JSP) für ein SimpleTag.
 jsp.error.taglibDirective.absUriCannotBeResolved=Die absolute URI: [{0}] kann 
weder durch web.xml noch durch die JAR-Files dieser Anwendung aufgelöst werden
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index d7891b2..c648401 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -31,6 +31,7 @@ jsp.error.attribute.nowhitespace=La spécification JSP 
requiert un caractère d'
 jsp.error.attribute.null_name=Le nom d'attribut est null
 jsp.error.attribute.standard.non_rt_with_expr=L''attribut [{0}] de l''action 
standard [{1}] n''accepte pas d''expressions
 jsp.error.attribute.unterminated=L''attribut pour [{0}] n''est pas 
correctement terminé
+jsp.error.backgroundCompilationFailed=La compilation en arrière plan a échoué
 jsp.error.bad.scratch.dir=Le paramètre "scratchDir" que vous avez spécifié : 
[{0}] est inutilisable.
 jsp.error.badStandardAction=L'action n'est pas reconnue comme une action 
standard.
 jsp.error.bad_attribute=L''attribut [{0}] est incorrect pour le tag [{1}] 
d''après la TLD indiquée
@@ -171,6 +172,7 @@ jsp.error.prefix.use_before_dcl=Le préfixe [{0}] spécifié 
dans cette directiv
 jsp.error.prolog_config_encoding_mismatch=Le page-encoding spécifié dans le 
prologue XML [{0}] est différent de celui spécifié dans le jsp-property-group 
[{1}]
 jsp.error.prolog_pagedir_encoding_mismatch=L''encodage spécifié dans le 
prologue XML [{0}] est différent de celui spécifié dans la directive de page 
[{1}]
 jsp.error.quotes.unterminated=Guillemets non terminés
+jsp.error.reload=Le rechargement du Servlet a échoué
 jsp.error.scripting.variable.missing_name=Incapable de déterminer le nom de 
variable scripting d''après l''attribut [{0}]
 jsp.error.security=L'initialisation de la sécurité a échouée pour le contexte
 jsp.error.servlet.destroy.failed=Erreur pendant le Servlet.destroy() de la 
page JSP
@@ -216,6 +218,7 @@ jsp.error.tlv.invalid.page=Message d''erreurs de validation 
provenant du TagLibr
 jsp.error.tlvclass.instantiation=Impossible de charger ou d''instancier la 
classe TagLibraryValidator : [{0}]
 jsp.error.unable.compile=Impossible de compiler la classe pour la JSP
 jsp.error.unable.deleteClassFile=Impossible de supprimer le fichier de classe 
[{0}]
+jsp.error.unable.getType=Impossible d''extraire un type de [{0}]
 jsp.error.unable.load=Impossible de charger la classe pour la JSP
 jsp.error.unable.renameClassFile=Impossible de renommer le fichier de classe 
de [{0}] vers [{1}]
 jsp.error.unable.to_find_method=Impossible de trouver une méthode de mise à 
jour pour l''attribut : [{0}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties 
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 9e04013..e5af200 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -31,6 +31,7 @@ jsp.error.attribute.nowhitespace=JSP の仕様により、属性名の前に空
 jsp.error.attribute.null_name=空の属性名です
 jsp.error.attribute.standard.non_rt_with_expr=[{1}] 標準アクションの [{0}] 
属性はどんな式も受け付けません
 jsp.error.attribute.unterminated=[{0}] の属性が正しく終了していません
+jsp.error.backgroundCompilationFailed=バックグラウンドのコンパイルに失敗しました
 jsp.error.bad.scratch.dir=あなたが指定したscratchDir: [{0}] は使用できません
 jsp.error.badStandardAction=無効な標準アクションです
 jsp.error.bad_attribute=TLDによると、タグ [{1}] の属性 [{0}] は無効です
@@ -172,6 +173,7 @@ jsp.error.prefix.use_before_dcl=このTagディレクティブで指定されて
 jsp.error.prolog_config_encoding_mismatch=XML宣言部で指定されたpage-encoding [{0}] 
がjsp-property-group中の指定と異なります [{1}]
 jsp.error.prolog_pagedir_encoding_mismatch=XML宣言部で指定されたpage-encoding [{0}] 
がpageディレクティブ中の指定 [{1}] と異なっています
 jsp.error.quotes.unterminated=引用符が終了していません
+jsp.error.reload=サーブレットのリロードに失敗しました
 jsp.error.scripting.variable.missing_name=属性 [{0}] からスクリプト変数名を決定できません
 jsp.error.security=コンテキストのセキュリティの初期化に失敗しました。
 jsp.error.servlet.destroy.failed=JSPページのServlet.destroy()中の例外
@@ -218,6 +220,7 @@ jsp.error.tlv.invalid.page=[{1}] 中の [{0}] 
に対するTagLibraryValidatorの
 jsp.error.tlvclass.instantiation=TagLibraryValidatorクラスのロード又はインスタンス化に失敗しました: 
[{0}]
 jsp.error.unable.compile=JSPのクラスをコンパイルできません
 jsp.error.unable.deleteClassFile=クラスファイルを削除できません
+jsp.error.unable.getType=[{0}]から型を抽出できません。
 jsp.error.unable.load=JSPのクラスをロードできません
 jsp.error.unable.renameClassFile=クラスファイルの名前を[{0}]から[{1}]に変更できません
 jsp.error.unable.to_find_method=属性 [{0}] のsetterメソッドが見つかりません
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 7a9baee..8b84275 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -31,6 +31,7 @@ jsp.error.attribute.nowhitespace=JSP 스펙에 따르면, 속성 이름은 반
 jsp.error.attribute.null_name=속성 이름이 널임
 jsp.error.attribute.standard.non_rt_with_expr=표준 액션 [{1}]의 속성 [{0}]은(는), 어떠한 
표현식도 받아들이지 않습니다.
 jsp.error.attribute.unterminated=[{0}]을(를) 위한 속성 값이 올바르게 종료되지 않았습니다.
+jsp.error.backgroundCompilationFailed=백그라운드 컴파일 작업 실패
 jsp.error.bad.scratch.dir=귀하가 지정한 scratchDir [{0}]은(는) 사용할 수 없습니다.
 jsp.error.badStandardAction=유효하지 않은 표준 액션
 jsp.error.bad_attribute=TLD에 따르면, 속성 [{0}]은(는) 태그 [{1}]을(를) 위해 유효하지 않습니다.
@@ -170,6 +171,7 @@ jsp.error.prefix.use_before_dcl=이 태그 지시어에 지정된 prefix [{0}]
 jsp.error.prolog_config_encoding_mismatch=XML 프롤로그 [{0}]에 지정된 페이지 인코딩이, 
jsp-property-group [{1}]에 지정된 것과 다릅니다.
 jsp.error.prolog_pagedir_encoding_mismatch=XML 프롤로그 [{0}]에 지정된 페이지 인코딩이, 페이지 
지시어 [{1}]에 지정된 것과 다릅니다.
 jsp.error.quotes.unterminated=종료되지 않은 인용부들
+jsp.error.reload=서블릿을 다시 로드하지 못했습니다.
 jsp.error.scripting.variable.missing_name=속성 [{0}](으)로부터 스크립팅 변수 이름을 결정할 수 
없습니다.
 jsp.error.security=컨텍스트를 위한 보안 초기화 작업이 실패했습니다.
 jsp.error.servlet.destroy.failed=JSP 페이지를 위한 Servlet.destroy() 호출 중 예외 발생
@@ -216,6 +218,7 @@ jsp.error.tlv.invalid.page=[{1}] 내의 [{0}]을(를) 위한 
TagLibraryValidator
 jsp.error.tlvclass.instantiation=TagLibraryValidator 클래스 [{0}]을(를) 로드하거나 인스턴스를 
생성하지 못했습니다.
 jsp.error.unable.compile=JSP를 위한 클래스를 컴파일할 수 없습니다.
 jsp.error.unable.deleteClassFile=클래스 파일을 삭제할 수 없습니다.
+jsp.error.unable.getType=[{0}](으)로부터 타입을 추출할 수 없습니다.
 jsp.error.unable.load=JSP를 위한 클래스를 로드할 수 없습니다.
 jsp.error.unable.renameClassFile=클래스 파일의 이름을 [{0}]에서 [{1}] (으)로 바꿀 수 없습니다.
 jsp.error.unable.to_find_method=속성 [{0}]을(를) 위한 setter 메소드를 찾을 수 없습니다.
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 379b57d..3888bfb 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -31,6 +31,7 @@ jsp.error.attribute.nowhitespace=JSP 规范要求一个属性名字前有空格
 jsp.error.attribute.null_name=空属性名
 jsp.error.attribute.standard.non_rt_with_expr=[{1}]标准操作的[{0}]属性不接受任何表达式
 jsp.error.attribute.unterminated=[{0}]的属性值未正确终止
+jsp.error.backgroundCompilationFailed=后台编译失败
 jsp.error.bad.scratch.dir=你指定的 scratchDir:[{0}] 不可用。
 jsp.error.badStandardAction=无效的标准操作。
 jsp.error.bad_attribute=属性[{0}]无效为tag[{1}] 通过TLD
@@ -170,6 +171,7 @@ jsp.error.prefix.use_before_dcl=tag指令中设置的前缀[{0}]之前已被[{1}
 jsp.error.prolog_config_encoding_mismatch=XML prolog 
[{0}]中指定的页面编码与jsp-property-group [{1}]中指定的页面编码不同
 jsp.error.prolog_pagedir_encoding_mismatch=指定在XML语言[{0}]的网页编码是不同于指定在网页的指令[{1}]。
 jsp.error.quotes.unterminated=未终结的引号
+jsp.error.reload=servlet重新加载失败
 jsp.error.scripting.variable.missing_name=无法从属性[{0}]确定脚本变量名称
 jsp.error.security=上下文的安全初始化失败
 jsp.error.servlet.destroy.failed=JSP页面的Servlet.destroy()期间出现异常
@@ -215,6 +217,7 @@ 
jsp.error.tlv.invalid.page=):[{0}]和[{1}]的TagLibraryValidator的验证错误
 jsp.error.tlvclass.instantiation=未能加载或实例化TagLibraryValidator类:[{0}]
 jsp.error.unable.compile=无法为JSP编译类
 jsp.error.unable.deleteClassFile=无法删除class文件[{0}]
+jsp.error.unable.getType=无法从[{0}]提取类型
 jsp.error.unable.load=无法加载JSP的相关类
 jsp.error.unable.renameClassFile=无法重命名类文件[{0}]为[{1}]
 jsp.error.unable.to_find_method=不能为属性:[{0}]找到setter 方法.

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to