[jbossweb-commits] JBossWeb SVN: r2348 - branches/7.4.x/src/main/java/org/apache/jasper/compiler.
Author: remy.maucherat(a)jboss.com
Date: 2014-01-20 15:30:54 -0500 (Mon, 20 Jan 2014)
New Revision: 2348
Modified:
branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java
Log:
Port additional fix.
Modified: branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java 2014-01-20
16:43:32 UTC (rev 2347)
+++ branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java 2014-01-20
20:30:54 UTC (rev 2348)
@@ -152,7 +152,7 @@
if (hasNext()) {
Token t2 = nextToken();
if (t2 instanceof Id) {
- s1 = s2;
+ s1 = s2.trim();
s2 = t2.toString();
if (hasNext()) {
curToken = nextToken();
@@ -161,7 +161,7 @@
}
}
if (curToken.toChar() == '(') {
- ELexpr.add(new ELNode.Function(s1.trim(), s2.trim()));
+ ELexpr.add(new ELNode.Function(s1, s2.trim()));
return true;
}
curToken = original;