tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r698918 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/el/parser/ELParser.java java/org/apache/el/parser/ELParser.jjt webapps/docs/changelog.xml
Date Thu, 25 Sep 2008 10:36:30 GMT
Author: markt
Date: Thu Sep 25 03:36:29 2008
New Revision: 698918

URL: http://svn.apache.org/viewvc?rev=698918&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45648
Don't trim the last character from the namespace

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java
    tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 25 03:36:29 2008
@@ -1 +1 @@
-/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,695053,695311
+/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691805,692748,695053,695311,698227,698236

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698918&r1=698917&r2=698918&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 03:36:29 2008
@@ -88,12 +88,6 @@
   +1: markt, remm
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45648
-  http://svn.apache.org/viewvc?rev=690770&view=rev
-  Don't trim the last character from the namespace
-  +1: markt, remm, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45628
   http://svn.apache.org/viewvc?rev=691282&view=rev
   JARs without deps should always be fulfilled

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java?rev=698918&r1=698917&r2=698918&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java Thu Sep 25 03:36:29 2008
@@ -1188,7 +1188,7 @@
       }
       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);

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt?rev=698918&r1=698917&r2=698918&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt Thu Sep 25 03:36:29 2008
@@ -281,7 +281,7 @@
     (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);

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698918&r1=698917&r2=698918&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 03:36:29 2008
@@ -108,7 +108,11 @@
         regression caused by the previous fix for <bug>42565</bug>. The original
         fix for <bug>42565</bug> has been reverted and a new fix applied.
         (markt)
-      </fix> 
+      </fix>
+      <fix>
+        <bug>45648</bug>: Don't trim the last character when parsing the EL
+        namespace. (markt)
+      </fix>
       <fix>
         <bug>45666</bug>: Prevent infinite loop on include. (markt)
       </fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message