You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2001/10/05 19:07:17 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources ProxyDirContext.java
remm 01/10/05 10:07:17
Modified: catalina/src/share/org/apache/naming/resources Tag:
tomcat_40_branch ProxyDirContext.java
Log:
- Also use the content length to revalidate.
Revision Changes Path
No revision
No revision
1.6.2.2 +8 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Index: ProxyDirContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- ProxyDirContext.java 2001/10/04 19:29:12 1.6.2.1
+++ ProxyDirContext.java 2001/10/05 17:07:17 1.6.2.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v 1.6.2.1 2001/10/04 19:29:12 remm Exp $
- * $Revision: 1.6.2.1 $
- * $Date: 2001/10/04 19:29:12 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v 1.6.2.2 2001/10/05 17:07:17 remm Exp $
+ * $Revision: 1.6.2.2 $
+ * $Date: 2001/10/05 17:07:17 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* Proxy Directory Context implementation.
*
* @author Remy Maucherat
- * @version $Revision: 1.6.2.1 $ $Date: 2001/10/04 19:29:12 $
+ * @version $Revision: 1.6.2.2 $ $Date: 2001/10/05 17:07:17 $
*/
public class ProxyDirContext implements DirContext {
@@ -1379,6 +1379,7 @@
if (entry.attributes == null)
return false;
long lastModified = entry.attributes.getLastModified();
+ long contentLength = entry.attributes.getContentLength();
if (lastModified <= 0)
return false;
try {
@@ -1390,7 +1391,9 @@
attributes = (ResourceAttributes) tempAttributes;
}
long lastModified2 = attributes.getLastModified();
- return (lastModified == lastModified2);
+ long contentLength2 = attributes.getContentLength();
+ return (lastModified == lastModified2)
+ && (contentLength == contentLength2);
} catch (NamingException e) {
return false;
}