You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/08/17 20:36:16 UTC
svn commit: r986446 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
Author: ivaynberg
Date: Tue Aug 17 18:36:16 2010
New Revision: 986446
URL: http://svn.apache.org/viewvc?rev=986446&view=rev
Log:
Issue: WICKET-2996
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java?rev=986446&r1=986445&r2=986446&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java Tue Aug 17 18:36:16 2010
@@ -236,12 +236,14 @@ public abstract class AbstractResource i
{
WebRequest request = (WebRequest)attributes.getRequest();
Date ifModifiedSince = request.getIfModifiedSinceHeader();
- Date lastModifed = getLastModified();
+ Date lastModified = getLastModified();
- if (ifModifiedSince != null && lastModifed != null &&
- lastModifed.before(ifModifiedSince))
+ if (ifModifiedSince != null && lastModified != null)
{
- return false;
+ // Round down to the nearest second for a proper compare
+ long modified = this.lastModified.getTime() / 1000 * 1000;
+
+ return ifModifiedSince.getTime() < modified;
}
else
{