You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/06/25 00:27:41 UTC
svn commit: r957739 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java
Author: lu4242
Date: Thu Jun 24 22:27:40 2010
New Revision: 957739
URL: http://svn.apache.org/viewvc?rev=957739&view=rev
Log:
MYFACES-2769 Resource should expire immediately in javax.faces.PROJECT_STAGE=Development (thanks to Martin Koci for provide this patch)
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java?rev=957739&r1=957738&r2=957739&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java Thu Jun 24 22:27:40 2010
@@ -291,7 +291,18 @@ public class ResourceImpl extends Resour
if (lastModified >= 0)
{
headers.put("Last-Modified", ResourceUtils.formatDateHeader(lastModified));
- headers.put("Expires", ResourceUtils.formatDateHeader(System.currentTimeMillis()+_resourceHandlerSupport.getMaxTimeExpires()));
+
+ long expires;
+ if (facesContext.isProjectStage(ProjectStage.Development))
+ {
+ // Force to expire now to prevent caching on development time.
+ expires = System.currentTimeMillis();
+ }
+ else
+ {
+ expires = System.currentTimeMillis() + _resourceHandlerSupport.getMaxTimeExpires();
+ }
+ headers.put("Expires", ResourceUtils.formatDateHeader(expires));
}
return headers;