Author: remy.maucherat(a)jboss.com
Date: 2012-02-03 04:23:02 -0500 (Fri, 03 Feb 2012)
New Revision: 1942
Modified:
trunk/java/org/apache/jasper/compiler/Generator.java
trunk/webapps/docs/changelog.xml
Log:
AS7-3562: Fix leak on invalid tag pooling when JSP id consumer is used. Submitted by
Stuart Douglas.
Modified: trunk/java/org/apache/jasper/compiler/Generator.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Generator.java 2012-02-02 16:24:19 UTC (rev
1941)
+++ trunk/java/org/apache/jasper/compiler/Generator.java 2012-02-03 09:23:02 UTC (rev
1942)
@@ -2264,8 +2264,7 @@
if (n.implementsBodyTag()) {
out.printin("if (");
out.print(tagEvalVar);
- out
- .println(" !=
javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE) {");
+ out.println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)
{");
// Assume EVAL_BODY_BUFFERED
out.pushIndent();
out.printil("out = _jspx_page_context.pushBody();");
@@ -2354,8 +2353,7 @@
syncScriptingVars(n, VariableInfo.AT_BEGIN);
syncScriptingVars(n, VariableInfo.NESTED);
- out
- .printil("if (evalDoAfterBody !=
javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)");
+ out.printil("if (evalDoAfterBody !=
javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)");
out.pushIndent();
out.printil("break;");
out.popIndent();
@@ -2369,8 +2367,7 @@
if (n.implementsBodyTag()) {
out.printin("if (");
out.print(tagEvalVar);
- out
- .println(" !=
javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE) {");
+ out.println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)
{");
out.pushIndent();
out.printil("out = _jspx_page_context.popBody();");
if (n.implementsTryCatchFinally()) {
@@ -2390,8 +2387,7 @@
out.printin("if (");
out.print(tagHandlerVar);
- out
- .println(".doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE)
{");
+ out.println(".doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE)
{");
out.pushIndent();
if (!n.implementsTryCatchFinally()) {
if (isPoolingEnabled && !(n.implementsJspIdConsumer())) {
@@ -2437,7 +2433,7 @@
out.println(".doFinally();");
}
- if (isPoolingEnabled) {
+ if (isPoolingEnabled && !(n.implementsJspIdConsumer())) {
out.printin(n.getTagHandlerPoolName());
out.print(".reuse(");
out.print(tagHandlerVar);
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2012-02-02 16:24:19 UTC (rev 1941)
+++ trunk/webapps/docs/changelog.xml 2012-02-03 09:23:02 UTC (rev 1942)
@@ -30,6 +30,10 @@
Disable Java identifier check by default (set
org.apache.el.parser.SKIP_IDENTIFIER_CHECK to
false to enable it back). (remm)
</fix>
+ <fix>
+ <jboss-jira>AS7-3562</jboss-jira>: Fix leak on invalid tag pooling
when JSP id consumer is used.
+ Submitted by Stuart Douglas. (remm)
+ </fix>
</changelog>
</subsection>
</section>
Show replies by date