[patch] Proposed patch v1

bug55671-tc6-v1.patch (text/plain), 7.41 KB, created by Mark Thomas on 2014-01-09 10:23:22 UTC

(hide)

Description: Proposed patch v1

Filename:

MIME Type:

Creator: Mark Thomas

Created: 2014-01-09 10:23:22 UTC

Size: 7.41 KB

patch

obsolete

>diff --git a/conf/web.xml b/conf/web.xml >index 16cc2a6..a3acebf 100644 >--- a/conf/web.xml >+++ b/conf/web.xml >@@ -196,7 +196,8 @@ > <!-- a separate JVM is used for JSP page compiles --> > <!-- from the one Tomcat is running in. [true] --> > <!-- --> >- <!-- genStrAsCharArray Should text strings be generated as char --> >+ <!-- genStringAsCharArray --> >+ <!-- Should text strings be generated as char --> > <!-- arrays, to improve performance in some cases? --> > <!-- [false] --> > <!-- --> >diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java >index 8353361..3399a32 100644 >--- a/java/org/apache/jasper/EmbeddedServletOptions.java >+++ b/java/org/apache/jasper/EmbeddedServletOptions.java >@@ -27,7 +27,6 @@ import org.apache.jasper.compiler.TldLocationsCache; > import org.apache.jasper.compiler.JspConfig; > import org.apache.jasper.compiler.TagPluginManager; > import org.apache.jasper.compiler.Localizer; >-import org.apache.jasper.xmlparser.ParserUtils; > import org.apache.juli.logging.Log; > import org.apache.juli.logging.LogFactory; > >@@ -544,7 +543,11 @@ public final class EmbeddedServletOptions implements Options { > } > } > >- String genCharArray = config.getInitParameter("genStrAsCharArray"); >+ String genCharArray = config.getInitParameter("genStringAsCharArray"); >+ if (genCharArray == null) { >+ // Try the old name >+ genCharArray = config.getInitParameter("genStrAsCharArray"); >+ } > if (genCharArray != null) { > if (genCharArray.equalsIgnoreCase("true")) { > genStringAsCharArray = true; >diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties >index 43d77f2..ec7e4a6 100644 >--- a/java/org/apache/jasper/resources/LocalStrings.properties >+++ b/java/org/apache/jasper/resources/LocalStrings.properties >@@ -174,7 +174,7 @@ jsp.warning.development=Warning: Invalid value for the initParam development. Wi > jsp.warning.fork=Warning: Invalid value for the initParam fork. Will use the default value of \"true\" > jsp.warning.reloading=Warning: Invalid value for the initParam reloading. Will use the default value of \"true\" > jsp.warning.dumpSmap=Warning: Invalid value for the initParam dumpSmap. Will use the default value of \"false\" >-jsp.warning.genchararray=Warning: Invalid value for the initParam genStrAsCharArray. Will use the default value of \"false\" >+jsp.warning.genchararray=Warning: Invalid value for the initParam genStringAsCharArray. Will use the default value of \"false\" > jsp.warning.suppressSmap=Warning: Invalid value for the initParam suppressSmap. Will use the default value of \"false\" > jsp.warning.displaySourceFragment=Warning: Invalid value for the initParam displaySourceFragment. Will use the default value of \"true\" > jsp.error.badtaglib=Unable to open taglibrary {0} : {1} >diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties >index df58e1f..c7e57f8 100644 >--- a/java/org/apache/jasper/resources/LocalStrings_es.properties >+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties >@@ -167,7 +167,7 @@ jsp.warning.development = Aviso\: valor incorrecto para el initParam development > jsp.warning.fork = Aviso\: valor incorrecto para el initParam fork. Se usar\u00E1 el valor por defecto de "true" > jsp.warning.reloading = Aviso\: valor incorrecto para el initParam reloading. Se usar\u00E1 el valor por defecto de "true" > jsp.warning.dumpSmap = Aviso\: valor incorrecto para el initParam dumpSmap. Se usar\u00E1 el valor por defecto de "false" >-jsp.warning.genchararray = Aviso\: valor incorrecto para el initParam genStrAsCharArray. Se usar\u00E1 el valor por defecto de "false" >+jsp.warning.genchararray = Aviso\: valor incorrecto para el initParam genStringAsCharArray. Se usar\u00E1 el valor por defecto de "false" > jsp.warning.suppressSmap = Aviso\: valor incorrecto para el initParam suppressSmap. Se usar\u00E1 el valor por defecto de "false" > jsp.warning.displaySourceFragment = Aviso\: valor incorrecto para el initParam displaySourceFragment. Se usar\u00E1 el valor por defecto de "verdadero" > jsp.error.badtaglib = No se puede abrir la biblioteca de tags {0}\: {1} >diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties >index 721e07d..3889389 100644 >--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties >+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties >@@ -158,7 +158,7 @@ jsp.warning.development=\u8b66\u544a: initParam development\u306e\u5024\u304c\u7 > jsp.warning.fork=\u8b66\u544a: initParam fork\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"true\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 > jsp.warning.reloading=\u8b66\u544a: initParam reloading\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"true\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 > jsp.warning.dumpSmap=\u8b66\u544a: initParam dumpSmap\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"false\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 >-jsp.warning.genchararray=\u8b66\u544a: initParam genStrAsCharArray\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"false\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 >+jsp.warning.genchararray=\u8b66\u544a: initParam genStringAsCharArray\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"false\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 > jsp.warning.suppressSmap=\u8b66\u544a: initParam suppressSmap\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024 \"false\" \u3092\u4f7f\u7528\u3057\u307e\u3059 > jsp.error.badtaglib=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea {0} \u3092\u30aa\u30fc\u30d7\u30f3\u3067\u304d\u307e\u305b\u3093: {1} > jsp.error.badGetReader=\u30b9\u30c8\u30ea\u30fc\u30e0\u304c\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306b\u306f\u3001Reader\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093 >diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml >index b19353b..717bef7 100644 >--- a/webapps/docs/jasper-howto.xml >+++ b/webapps/docs/jasper-howto.xml >@@ -139,8 +139,10 @@ valid bean class? <code>true</code> or <code>false</code>, default > performed in a separate JVM from Tomcat? <code>true</code> or > <code>false</code>, default <code>true</code>.</li> > >-<li><strong>genStrAsCharArray</strong> - Should text strings be generated as char >-arrays, to improve performance in some cases? Default <code>false</code>.</li> >+<li><strong>genStringAsCharArray</strong> - Should text strings be generated as >+char arrays, to improve performance in some cases? Default >+<code>false</code>. The alternative name of <strong>genStrAsCharArray</strong> >+for this initialisation parameter is also supported.</li> > > <li><strong>ieClassId</strong> - The class-id value to be sent to Internet > Explorer when using &lt;jsp:plugin&gt; tags. Default View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]