Author: markt Date: Thu Dec 16 23:35:17 2010 New Revision: 1050229 URL: http://svn.apache.org/viewvc?rev=1050229&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=13731 Make variables in <code>_jspService()</code> method final where possible.
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=1050229&r1=1050228&r2=1050229&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu Dec 16 23:35:17 2010 @@ -614,23 +614,20 @@ class Generator { // Class variable declarations genPreambleClassVariableDeclarations(); - // Constructor - // generateConstructor(className); - // Methods here genPreambleMethods(); // Now the service method out.printin("public void "); out.print(serviceMethodName); - out.println("(HttpServletRequest request, HttpServletResponse response)"); + out.println("(final HttpServletRequest request, final HttpServletResponse response)"); out.println(" throws java.io.IOException, ServletException {"); out.pushIndent(); out.println(); // Local variable declarations - out.printil("PageContext pageContext = null;"); + out.printil("final PageContext pageContext;"); if (pageInfo.isSession()) out.printil("HttpSession session = null;"); @@ -644,10 +641,10 @@ class Generator { out.printil("}"); } - out.printil("ServletContext application = null;"); - out.printil("ServletConfig config = null;"); + out.printil("final ServletContext application;"); + out.printil("final ServletConfig config;"); out.printil("JspWriter out = null;"); - out.printil("Object page = this;"); + out.printil("final Object page = this;"); out.printil("JspWriter _jspx_out = null;"); out.printil("PageContext _jspx_page_context = null;"); @@ -667,8 +664,7 @@ class Generator { out.printil("response.addHeader(\"X-Powered-By\", \"JSP/2.1\");"); } - out - .printil("pageContext = _jspxFactory.getPageContext(this, request, response,"); + out.printil("pageContext = _jspxFactory.getPageContext(this, request, response,"); out.printin("\t\t\t"); out.print(quote(pageInfo.getErrorPage())); out.print(", " + pageInfo.isSession()); Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1050229&r1=1050228&r2=1050229&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec 16 23:35:17 2010 @@ -179,6 +179,10 @@ </subsection> <subsection name="Jasper"> <changelog> + <add> + <bug>13731</bug>: Make variables in <code>_jspService()</code> method + final where possible. (markt) + </add> <fix> <bug>50408</bug>: Fix <code>NoSuchMethodException</code> when using scoped variables with EL method invocation. (markt) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org