tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r652655 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Date Thu, 01 May 2008 20:46:30 GMT
Author: markt
Date: Thu May  1 13:46:28 2008
New Revision: 652655

URL: http://svn.apache.org/viewvc?rev=652655&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877
Prevent collisions in tag pool names

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=652655&r1=652654&r2=652655&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May  1 13:46:28 2008
@@ -81,12 +81,6 @@
   +1: billbarker, markt, remm, fhanik
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877
-  Prevent collisions in tag pool names
-  http://svn.apache.org/viewvc?rev=651984&view=rev
-  +1: markt, remm, fhanik
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43366
   provide backwards compatibility for manager sessions command
   http://svn.apache.org/viewvc?rev=651988&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=652655&r1=652654&r2=652655&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Thu May  1 13:46:28
2008
@@ -294,6 +294,9 @@
                         attrNames[i] = attrs.getQName(i);
                     }
                     Arrays.sort(attrNames, Collections.reverseOrder());
+                    if (attrNames.length > 0) {
+                        poolName = poolName + "&";
+                    }
                     for (int i = 0; i < attrNames.length; i++) {
                         poolName = poolName + "_" + attrNames[i];
                     }

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=652655&r1=652654&r2=652655&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May  1 13:46:28 2008
@@ -191,6 +191,9 @@
       <fix>
         <bug>44766</bug>: EL doesn't coerce custom Number subclasses. (markt)
       </fix>
+      <fix>
+        <bug>44877</bug>: Prevent collisions on tag pool names. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Webapps">



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


Mime
View raw message