Author: remy.maucherat(a)jboss.com Date: 2009-03-27 09:54:49 -0400 (Fri, 27 Mar 2009) New Revision: 971 Modified: branches/2.1.x/java/org/apache/jasper/compiler/Compiler.java branches/2.1.x/webapps/docs/changelog.xml Log: - Port patch. Modified: branches/2.1.x/java/org/apache/jasper/compiler/Compiler.java =================================================================== --- branches/2.1.x/java/org/apache/jasper/compiler/Compiler.java 2009-03-27 12:33:33 UTC (rev 970) +++ branches/2.1.x/java/org/apache/jasper/compiler/Compiler.java 2009-03-27 13:54:49 UTC (rev 971) @@ -333,6 +333,14 @@ String[] smap = generateJava(); if (compileClass) { generateClass(smap); + // Set JspServletWrapper.servletClassLastModifiedTime after successful compile + String targetFileName = ctxt.getClassFileName(); + if (targetFileName != null) { + File targetFile = new File(targetFileName); + if (targetFile.exists() && jsw != null) { + jsw.setServletClassLastModifiedTime(targetFile.lastModified()); + } + } } } finally { if (tfp != null) { Modified: branches/2.1.x/webapps/docs/changelog.xml =================================================================== --- branches/2.1.x/webapps/docs/changelog.xml 2009-03-27 12:33:33 UTC (rev 970) +++ branches/2.1.x/webapps/docs/changelog.xml 2009-03-27 13:54:49 UTC (rev 971) @@ -43,6 +43,9 @@ <fix> EL resolver improvements when using a security manager. (markt) </fix> + <fix> + <bug>41606</bug>: Fix jspInit called twice. (markt) + </fix> </changelog> </subsection> </section>