Author: markt
Date: Fri Mar 27 09:42:47 2009
New Revision: 759074
URL: http://svn.apache.org/viewvc?rev=759074&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41606
Prevent double init() of JSP
Patch provided by Chris Halstead
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=759074&r1=759073&r2=759074&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Fri Mar 27
09:42:47 2009
@@ -332,6 +332,15 @@
String[] smap = generateJava();
if (compileClass) {
generateClass(smap);
+ // Fix for bugzilla 41606
+ // 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 && ctxt.isPrototypeMode()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
