svn commit: r704116 - /felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java

[wa...@apache.org]

Author: walkerr
Date: Mon Oct 13 06:23:10 2008
New Revision: 704116

URL: http://svn.apache.org/viewvc?rev=704116&view=rev
Log:
FELIX-407 - minor fix to ensure resource is returned in a case where modified timestamp of resource can't be determined

Modified:
    felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java

Modified: felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java
URL: http://svn.apache.org/viewvc/felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java?rev=704116&r1=704115&r2=704116&view=diff
==============================================================================
--- felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java (original)
+++ felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java Mon Oct 13 06:23:10 2008
@@ -306,8 +306,9 @@
         modSince /= 1000;
         resTimestamp /= 1000;
         
-        // Timestamp check to see if modified
-        if (modSince == -1 || resTimestamp > modSince)
+        // Timestamp check to see if modified - resTimestamp 0 check is for 
+        // safety in case we didn't manage to get a timestamp for the resource
+        if (resTimestamp == 0 || modSince == -1 || resTimestamp > modSince)
         {
             retval = true;
         }