You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ji...@apache.org on 2007/12/30 18:56:51 UTC
svn commit: r607568 - in /tomcat/tc6.0.x/trunk: STATUS.txt
java/org/apache/naming/resources/FileDirContext.java
Author: jim
Date: Sun Dec 30 09:56:50 2007
New Revision: 607568
URL: http://svn.apache.org/viewvc?rev=607568&view=rev
Log:
Merge r606994 from trunk:
http://issues.apache.org/bugzilla/show_bug.cgi?id=42503
ServletContext.getResourceAsStream returns stale data
patch by Arvind Srinivasan
arvindDOTsrinivasan sun com
Submitted by: funkman
Reviewed by: jim
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=607568&r1=607567&r2=607568&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Dec 30 09:56:50 2007
@@ -42,12 +42,6 @@
+1: markt,funkman, pero, yoavs
-1:
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=42503
- ServletContext.getResourceAsStream returns stale data
- http://svn.apache.org/viewvc?rev=606994&view=rev
- +1: funkman, markt, pero, yoavs, jim
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43285
Missing EL Coercion causes argument type mismatch
http://svn.apache.org/viewvc?rev=606996&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=607568&r1=607567&r2=607568&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java Sun Dec 30 09:56:50 2007
@@ -986,6 +986,8 @@
public FileResourceAttributes(File file) {
this.file = file;
+ getCreation();
+ getLastModified();
}
// --------------------------------------------------- Member Variables
@@ -1036,7 +1038,7 @@
public long getCreation() {
if (creation != -1L)
return creation;
- creation = file.lastModified();
+ creation = getLastModified();
return creation;
}
@@ -1048,7 +1050,7 @@
*/
public Date getCreationDate() {
if (creation == -1L) {
- creation = file.lastModified();
+ creation = getCreation();
}
return super.getCreationDate();
}
@@ -1074,7 +1076,7 @@
*/
public Date getLastModifiedDate() {
if (lastModified == -1L) {
- lastModified = file.lastModified();
+ lastModified = getLastModified();
}
return super.getLastModifiedDate();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org