Author: jboynes
Date: Mon Jan 20 18:22:16 2014
New Revision: 1559798
URL: http://svn.apache.org/r1559798
Log:
Fix for NPE introduced by r1559707 that caused ELParser test to fail.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1559798&r1=1559797&r2=1559798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java Mon Jan 20
18:22:16 2014
@@ -152,7 +152,7 @@ public class ELParser {
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 @@ public class ELParser {
}
}
if (curToken.toChar() == '(') {
- ELexpr.add(new ELNode.Function(s1.trim(), s2.trim()));
+ ELexpr.add(new ELNode.Function(s1, s2.trim()));
return true;
}
curToken = original;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
