Author: markt
Date: Thu Apr 24 14:13:40 2014
New Revision: 1589740
URL: http://svn.apache.org/r1589740
Log:
Minor clean-up. kkolinko review.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1589737-1589738
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1589740&r1=1589739&r2=1589740&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java Thu Apr
24 14:13:40 2014
@@ -266,7 +266,7 @@ public class ELParser {
if (output == null) {
output = new StringBuilder(len + 20);
}
- output.append(input.subSequence(lastAppend, i));
+ output.append(input.substring(lastAppend, i));
lastAppend = i + 1;
output.append('\\');
output.append(ch);
@@ -319,7 +319,7 @@ public class ELParser {
output = new StringBuilder(len + 20);
output.append(quote);
}
- output.append(input.subSequence(lastAppend, i));
+ output.append(input.substring(lastAppend, i));
lastAppend = i + 1;
output.append('\\');
output.append(ch);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1589740&r1=1589739&r2=1589740&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Thu Apr 24 14:13:40 2014
@@ -495,5 +495,5 @@ jsp.tldCache.noTldSummary=At least one J
#ELInterpreter
jsp.error.el_interpreter_class.instantiation=Failed to load or instantiate
ELInterpreter class [{0}]
-org.apache.jasper.compiler.ELParser.invalidQuotesForStringLiteral=The String
literal [{0}] is not valid. It must be contained with single or double quotes.
+org.apache.jasper.compiler.ELParser.invalidQuotesForStringLiteral=The String
literal [{0}] is not valid. It must be contained within single or double quotes.
org.apache.jasper.compiler.ELParser.invalidQuoting=The expression [{0}] is not
valid. Within a quoted String only [\], ['] and ["] may be escaped with [\].
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
