You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2017/01/06 13:28:40 UTC
svn commit: r1777605 - in /tomcat/trunk:
java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Author: remm
Date: Fri Jan 6 13:28:40 2017
New Revision: 1777605
URL: http://svn.apache.org/viewvc?rev=1777605&view=rev
Log:
Follow up for 60497: use the tag variable as the base for the reused flag.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1777605&r1=1777604&r2=1777605&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Fri Jan 6 13:28:40 2017
@@ -2396,7 +2396,7 @@ class Generator {
out.print(tagHandlerClassName);
out.println(".class);");
out.printin("boolean ");
- out.print(n.getTagHandlerPoolName());
+ out.print(tagHandlerVar);
out.println("_reused = false;");
} else {
writeNewInstance(tagHandlerVar, tagHandlerClassName);
@@ -2609,7 +2609,7 @@ class Generator {
out.print(".reuse(");
out.print(tagHandlerVar);
out.println(");");
- out.printin(n.getTagHandlerPoolName());
+ out.printin(tagHandlerVar);
out.println("_reused = true;");
}
@@ -2619,7 +2619,7 @@ class Generator {
out.pushIndent();
if (isPoolingEnabled && !(n.implementsJspIdConsumer())) {
out.printin("if (!");
- out.print(n.getTagHandlerPoolName());
+ out.print(tagHandlerVar);
out.println("_reused) {");
out.pushIndent();
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777605&r1=1777604&r2=1777605&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 6 13:28:40 2017
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.0.M17 (markt)" rtext="in development">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>60497</bug>: Follow up fix using a better variable name for the
+ tag reuse flag. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org