View | Details | Raw Unified | Return to bug 13731
Collapse All | Expand All

(-)jakarta-tomcat-4.1.12-src.orig/jasper/src/share/org/apache/jasper/compiler/Generator.java (-9 / +8 lines)
Lines 426-438 Link Here
426
426
427
	// Local variable declarations
427
	// Local variable declarations
428
	out.printil("JspFactory _jspxFactory = null;");
428
	out.printil("JspFactory _jspxFactory = null;");
429
	out.printil("javax.servlet.jsp.PageContext pageContext = null;");
429
	out.printil("javax.servlet.jsp.PageContext _jspx_pageContext = null;");
430
430
431
	if (pageInfo.isIsErrorPage())
431
	if (pageInfo.isIsErrorPage())
432
            out.printil("Throwable exception = (Throwable) request.getAttribute(\"javax.servlet.jsp.jspException\");");
432
            out.printil("Throwable exception = (Throwable) request.getAttribute(\"javax.servlet.jsp.jspException\");");
433
433
434
	out.printil("ServletContext application = null;");
435
	out.printil("ServletConfig config = null;");
436
	out.printil("Object page = this;");
434
	out.printil("Object page = this;");
437
435
438
     	// Number of tag object that need to be popped
436
     	// Number of tag object that need to be popped
Lines 458-477 Link Here
458
	out.print  (quote(pageInfo.getContentType()));
456
	out.print  (quote(pageInfo.getContentType()));
459
	out.println(");");
457
	out.println(");");
460
458
461
	out.printil("pageContext = _jspxFactory.getPageContext(this, request, response,");
459
	out.printil("final javax.servlet.jsp.PageContext pageContext = _jspxFactory.getPageContext(this, request, response,");
462
	out.printin("\t\t\t");
460
	out.printin("\t\t\t");
463
	out.print  (quote(pageInfo.getErrorPage()));
461
	out.print  (quote(pageInfo.getErrorPage()));
464
	out.print  (", " + pageInfo.isSession());
462
	out.print  (", " + pageInfo.isSession());
465
	out.print  (", " + pageInfo.getBuffer());
463
	out.print  (", " + pageInfo.getBuffer());
466
	out.print  (", " + pageInfo.isAutoFlush());
464
	out.print  (", " + pageInfo.isAutoFlush());
467
	out.println(");");
465
	out.println(");");
466
	out.printil("_jspx_pageContext = pageContext;");
468
467
469
	out.printil("application = pageContext.getServletContext();");
468
	out.printil("final ServletContext application = pageContext.getServletContext();");
470
	out.printil("config = pageContext.getServletConfig();");
469
	out.printil("final ServletConfig config = pageContext.getServletConfig();");
471
470
472
	if (pageInfo.isSession())
471
	if (pageInfo.isSession())
473
	    out.printil("final HttpSession session = pageContext.getSession();");
472
	    out.printil("final HttpSession session = pageContext.getSession();");
474
	out.printil("JSPWriter out = pageContext.getOut();");
473
	out.printil("final JspWriter out = pageContext.getOut();");
475
        out.printil("_jspx_out = out;");
474
        out.printil("_jspx_out = out;");
476
	out.println();
475
	out.println();
477
    }
476
    }
Lines 1780-1792 Link Here
1780
        out.printil("_jspx_out.clearBuffer();");
1779
        out.printil("_jspx_out.clearBuffer();");
1781
        out.popIndent();
1780
        out.popIndent();
1782
1781
1783
        out.printil("if (pageContext != null) pageContext.handlePageException(t);");
1782
        out.printil("if (_jspx_pageContext != null) _jspx_pageContext.handlePageException(t);");
1784
1783
1785
        out.popIndent();
1784
        out.popIndent();
1786
        out.printil("} finally {");
1785
        out.printil("} finally {");
1787
        out.pushIndent();
1786
        out.pushIndent();
1788
1787
1789
        out.printil("if (_jspxFactory != null) _jspxFactory.releasePageContext(pageContext);");
1788
        out.printil("if (_jspxFactory != null) _jspxFactory.releasePageContext(_jspx_pageContext);");
1790
1789
1791
        out.popIndent();
1790
        out.popIndent();
1792
        out.printil("}");
1791
        out.printil("}");

Return to bug 13731