Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45648

Note ELParser.java is auto-generated

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@690770 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/el/parser/ELParser.java b/java/org/apache/el/parser/ELParser.java
index 05aca1c..8e0130d 100644 (file)
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -1188,7 +1188,7 @@ public class ELParser/*@bgen(jjtree)*/implements ELParserTreeConstants, ELParser
       }
       t1 = jj_consume_token(IDENTIFIER);
                 if (t0 != null) {
-                        jjtn000.setPrefix(t0.image.substring(0, t0.image.length() - 1));
+                        jjtn000.setPrefix(t0.image);
                         jjtn000.setLocalName(t1.image);
                 } else {
                         jjtn000.setLocalName(t1.image);

diff --git a/java/org/apache/el/parser/ELParser.jjt b/java/org/apache/el/parser/ELParser.jjt
index 6d659a9..db207ab 100644 (file)
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -281,7 +281,7 @@ void Function() #Function :
        (t0=<IDENTIFIER> <COLON>)? t1=<IDENTIFIER>
        {
                if (t0 != null) {
-                       jjtThis.setPrefix(t0.image.substring(0, t0.image.length() - 1));
+                       jjtThis.setPrefix(t0.image);
                        jjtThis.setLocalName(t1.image);
                } else {
                        jjtThis.setLocalName(t1.image);