geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1468730 - /geronimo/external/trunk/tomcat-parent-7.0.39/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
Date Wed, 17 Apr 2013 02:54:38 GMT
Author: xiaming
Date: Wed Apr 17 02:54:38 2013
New Revision: 1468730

URL: http://svn.apache.org/r1468730
Log:
GERONIMO-6295 Patch is not accept by Tomcat community, so apply it into our self Tomcat release,
for 7.0.39 fork

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.39/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java

Modified: geronimo/external/trunk/tomcat-parent-7.0.39/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.39/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java?rev=1468730&r1=1468729&r2=1468730&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.39/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
(original)
+++ geronimo/external/trunk/tomcat-parent-7.0.39/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
Wed Apr 17 02:54:38 2013
@@ -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);



Mime
View raw message