Author: kkolinko
Date: Wed Jan 22 02:57:47 2014
New Revision: 1560240
URL: http://svn.apache.org/r1560240
Log:
Merging ELParser changes from trunk, to better align TC7 code with trunk here
(proposed TC6 patch for BZ 56029 already ports these changes to Tomcat 6)
Merged r1560177 from tomcat/trunk:
Remove unnecessary code
........
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1560177
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=1560240&r1=1560239&r2=1560240&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 Wed Jan
22 02:57:47 2014
@@ -155,7 +155,7 @@ public class ELParser {
if (hasNext()) {
Token t2 = nextToken();
if (t2 instanceof Id) {
- s1 = s2.trim();
+ s1 = s2;
s2 = t2.toTrimmedString();
if (hasNext()) {
curToken = nextToken();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
