Author: markt
Date: Sat Dec 27 13:04:45 2008
New Revision: 729674
URL: http://svn.apache.org/viewvc?rev=729674&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46397
Don't pool tag instances that implement JspIdConsumer
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
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
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 27 13:04:45 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,726052,728032,728947
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,726052,728032,728947,729057
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=729674&r1=729673&r2=729674&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec 27 13:04:45 2008
@@ -257,12 +257,6 @@
+1: markt, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46397
- Don't pool tag instances that implement JspIdConsumer
- http://svn.apache.org/viewvc?rev=729057&view=rev
- +1: markt, fhanik, billbarker
- -1:
-
* Make certain that classes are first loaded by trusted code
when working in a sandbox.
http://svn.apache.org/viewvc?rev=729206&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=729674&r1=729673&r2=729674&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 Sat Dec
27 13:04:45 2008
@@ -2397,7 +2397,7 @@
out.println(".doFinally();");
}
- if (isPoolingEnabled) {
+ if (isPoolingEnabled && !(n.implementsJspIdConsumer())) {
out.printin(n.getTagHandlerPoolName());
out.print(".reuse(");
out.print(tagHandlerVar);
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=729674&r1=729673&r2=729674&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Dec 27 13:04:45 2008
@@ -293,6 +293,10 @@
dependencies that are located inside a JAR file. Patch provided by
Cédric Mailleux. (markt)
</fix>
+ <fix>
+ <bug>46397</bug>: Don't pool tag instances that implement
JspIdConsumer.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
