Author: markt
Date: Tue May 22 19:42:08 2007
New Revision: 540810
URL: http://svn.apache.org/viewvc?view=rev&rev=540810
Log:
Port fix for bug 42438. Duplicate temp variable was created. Patch provided by
Brian Lenz.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Node.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Node.java?view=diff&rev=540810&r1=540809&r2=540810
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Node.java Tue May 22
19:42:08 2007
@@ -1861,7 +1861,6 @@
super(qName, ATTRIBUTE_ACTION, attrs, nonTaglibXmlnsAttrs,
taglibAttrs, start, parent);
- temporaryVariableName = JspUtil.nextTemporaryVariableName();
if ("false".equals(this.getAttributeValue("trim"))) {
// (if null or true, leave default of true)
trim = false;
@@ -1908,6 +1907,9 @@
* (this probably could go elsewhere, but it's convenient here)
*/
public String getTemporaryVariableName() {
+ if (temporaryVariableName == null) {
+ temporaryVariableName = JspUtil.nextTemporaryVariableName();
+ }
return temporaryVariableName;
}
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?view=diff&rev=540810&r1=540809&r2=540810
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue May 22 19:42:08 2007
@@ -36,6 +36,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>42438</bug> Duplicate temporary variables were created when
+ jsp:attribute was used in conjunction with custom tags. Patch provided
+ by Brian Lenz. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Webapps">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
