Author: jboynes
Date: Mon Jan 20 20:07:23 2014
New Revision: 1559820
URL: http://svn.apache.org/r1559820
Log:
merge fix for potential NPE
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:r1559798
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=1559820&r1=1559819&r2=1559820&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 Mon Jan
20 20:07:23 2014
@@ -154,7 +154,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();
@@ -163,7 +163,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: [email protected]
For additional commands, e-mail: [email protected]
