| commit | c9e3340d77e834c5a84a38b5d4b482e88ea59e15 | [log] [tgz] |
|---|---|---|
| author | Rob Walker <walkerr@apache.org> | Mon Oct 13 13:23:10 2008 +0000 |
| committer | Rob Walker <walkerr@apache.org> | Mon Oct 13 13:23:10 2008 +0000 |
| tree | 93d0355ac3d5e235e833543af78d9242d53091fe | |
| parent | 3cf894b4c69dc4fb93f971de6c9ada52f850d7c2 [diff] |
FELIX-407 - minor fix to ensure resource is returned in a case where modified timestamp of resource can't be determined git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@704116 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java b/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java index acc6235..4addc28 100644 --- a/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java +++ b/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java
@@ -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; }