Author: kkolinko
Date: Sun May 11 17:36:30 2014
New Revision: 1593826
URL: http://svn.apache.org/r1593826
Log:
Followup to r1589635
To simplify code and align it with TC7 & 8.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1589737-1589738
Merged /tomcat/tc7.0.x/trunk:r1589740
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593826&r1=1593825&r2=1593826&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 11 17:36:30 2014
@@ -28,13 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Followup to r1589635
- To simplify code and align it with TC7 & 8.
- (Discussed in Re:r1589635)
- http://svn.apache.org/r1589737
- +1: kkolinko, markt, fhanik
- -1:
-
* Additional change missed in back-port to fix BZ 56334
http://people.apache.org/~markt/patches/2014-04-28-bug56334-tc6-v1.patch
+1: markt, kkolinko, fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1593826&r1=1593825&r2=1593826&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java Sun May
11 17:36:30 2014
@@ -263,7 +263,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);
@@ -316,7 +316,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);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
