You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/04/24 05:42:03 UTC
svn commit: r1329538 -
/geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
Author: xiaming
Date: Tue Apr 24 03:42:03 2012
New Revision: 1329538
URL: http://svn.apache.org/viewvc?rev=1329538&view=rev
Log:
GERONIMO-6295 Patch is not accept by Tomcat community, so apply it into our self Tomcat release
Modified:
geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
Modified: geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java?rev=1329538&r1=1329537&r2=1329538&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java Tue Apr 24 03:42:03 2012
@@ -471,7 +471,16 @@ public abstract class Compiler {
if (checkClass && jsw != null) {
jsw.setServletClassLastModifiedTime(targetLastModified);
}
- if (targetLastModified != jspRealLastModified.longValue()) {
+ /*
+ * File.lastModified() will truncate the last three digits in the long value,
+ * While java.util.Date.getTime() will return a precise value. The equation
+ * operation cannot be used here in OSGi world.
+ *
+ * Patch for Tomcat bug ID 52744 is not accepted by Tomcat community, so apply
+ * it in our own Tomcat release.
+ */
+ // if (targetLastModified != jspRealLastModified.longValue()) {
+ if ( (jspRealLastModified.longValue() - targetLastModified) > 1000l ) {
if (log.isDebugEnabled()) {
log.debug("Compiler: outdated: " + targetFile + " "
+ targetLastModified);