Author: kkolinko
Date: Wed Jan 22 02:55:20 2014
New Revision: 1560238
URL: http://svn.apache.org/r1560238
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 r1410742 from tomcat/trunk:
Refactor since returning -1 makes no sense with chars. The old code worked but
it was a little odd (and FindBugs didn't like it).
........
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:r1410742
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=1560238&r1=1560237&r2=1560238&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:55:20 2014
@@ -265,8 +265,9 @@ public class ELParser {
char ch = nextChar();
if (Character.isJavaIdentifierStart(ch)) {
int start = index - 1;
- while ((ch = peekChar()) != -1
- && Character.isJavaIdentifierPart(ch)) {
+ while (index < expression.length() &&
+ Character.isJavaIdentifierPart(
+ ch = expression.charAt(index))) {
nextChar();
}
return new Id(getAndResetWhiteSpace(),
expression.substring(start, index));
@@ -334,13 +335,6 @@ public class ELParser {
return expression.charAt(index++);
}
- private char peekChar() {
- if (index >= expression.length()) {
- return (char) -1;
- }
- return expression.charAt(index);
- }
-
private int getIndex() {
return index;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
