diff -ru jakarta-tomcat-4.1.12-src.orig/jasper/src/share/org/apache/jasper/compiler/Generator.java jakarta-tomcat-4.1.12-src/jasper/src/share/org/apache/jasper/compiler/Generator.java
--- jakarta-tomcat-4.1.12-src.orig/jasper/src/share/org/apache/jasper/compiler/Generator.java	Fri Oct 18 07:10:42 2002
+++ jakarta-tomcat-4.1.12-src/jasper/src/share/org/apache/jasper/compiler/Generator.java	Fri Oct 18 09:50:12 2002
@@ -426,13 +426,11 @@
 
 	// Local variable declarations
 	out.printil("JspFactory _jspxFactory = null;");
-	out.printil("javax.servlet.jsp.PageContext pageContext = null;");
+	out.printil("javax.servlet.jsp.PageContext _jspx_pageContext = null;");
 
 	if (pageInfo.isIsErrorPage())
             out.printil("Throwable exception = (Throwable) request.getAttribute(\"javax.servlet.jsp.jspException\");");
 
-	out.printil("ServletContext application = null;");
-	out.printil("ServletConfig config = null;");
 	out.printil("Object page = this;");
 
      	// Number of tag object that need to be popped
@@ -458,20 +456,21 @@
 	out.print  (quote(pageInfo.getContentType()));
 	out.println(");");
 
-	out.printil("pageContext = _jspxFactory.getPageContext(this, request, response,");
+	out.printil("final javax.servlet.jsp.PageContext pageContext = _jspxFactory.getPageContext(this, request, response,");
 	out.printin("\t\t\t");
 	out.print  (quote(pageInfo.getErrorPage()));
 	out.print  (", " + pageInfo.isSession());
 	out.print  (", " + pageInfo.getBuffer());
 	out.print  (", " + pageInfo.isAutoFlush());
 	out.println(");");
+	out.printil("_jspx_pageContext = pageContext;");
 
-	out.printil("application = pageContext.getServletContext();");
-	out.printil("config = pageContext.getServletConfig();");
+	out.printil("final ServletContext application = pageContext.getServletContext();");
+	out.printil("final ServletConfig config = pageContext.getServletConfig();");
 
 	if (pageInfo.isSession())
 	    out.printil("final HttpSession session = pageContext.getSession();");
-	out.printil("JSPWriter out = pageContext.getOut();");
+	out.printil("final JspWriter out = pageContext.getOut();");
         out.printil("_jspx_out = out;");
 	out.println();
     }
@@ -1780,13 +1779,13 @@
         out.printil("_jspx_out.clearBuffer();");
         out.popIndent();
 
-        out.printil("if (pageContext != null) pageContext.handlePageException(t);");
+        out.printil("if (_jspx_pageContext != null) _jspx_pageContext.handlePageException(t);");
 
         out.popIndent();
         out.printil("} finally {");
         out.pushIndent();
 
-        out.printil("if (_jspxFactory != null) _jspxFactory.releasePageContext(pageContext);");
+        out.printil("if (_jspxFactory != null) _jspxFactory.releasePageContext(_jspx_pageContext);");
 
         out.popIndent();
         out.printil("}");