Author: markt
Date: Thu Jun 4 14:18:39 2009
New Revision: 781746
URL: http://svn.apache.org/viewvc?rev=781746&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/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Compiler.java
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=781746&r1=781745&r2=781746&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jun 4 14:18:39 2009
@@ -141,6 +141,10 @@
(markt)
</fix>
<fix>
+ <bug>41606</bug>: Fix double initialisation of JSPs. Patch provided by
+ Chris Halstead. (markt)
+ </fix>
+ <fix>
<bug>45666</bug>: Fix infinite loop on include. Patch provided by Tom
Wadzinski. (markt)
</fix>
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Compiler.java?rev=781746&r1=781745&r2=781746&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Compiler.java
(original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Compiler.java
Thu Jun 4 14:18:39 2009
@@ -296,6 +296,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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
