cmailleux 2005/02/16 12:17:04 CET
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/params ParamBean.java
Log:
Add a long delayFromNow to ensure that when we set a delay for expiration
date it's a true delay
Revision Changes Path
1.149.2.10 +8 -4 jahia/src/java/org/jahia/params/ParamBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/params/ParamBean.java.diff?r1=1.149.2.9&r2=1.149.2.10&f=h
Index: ParamBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/params/Attic/ParamBean.java,v
retrieving revision 1.149.2.9
retrieving revision 1.149.2.10
diff -u -r1.149.2.9 -r1.149.2.10
--- ParamBean.java 14 Jan 2005 12:58:47 -0000 1.149.2.9
+++ ParamBean.java 16 Feb 2005 11:17:03 -0000 1.149.2.10
@@ -288,6 +288,7 @@
private int diffVersionID = 0;
private ArrayList pageURLKeys = new ArrayList();
+ private long delayFromNow;
static {
/** @todo we might want to put this in a configuration file so the
@@ -2769,7 +2770,12 @@
* (but may be flush upon content changes or other events).
*/
public java.util.Date getCacheExpirationDate () {
- return cacheExpirationDate;
+ if(cacheExpirationDate!=null)
+ return cacheExpirationDate;
+ else if(delayFromNow!=0) {
+ return new Date(System.currentTimeMillis() + delayFromNow);
+ }
+ return null;
}
/**
@@ -2791,9 +2797,7 @@
* from now for the expiration of the current page's cache.
*/
final public void setCacheExpirationDelay (long delayFromNow) {
- Date nowDate = new Date();
- Date expirationDate = new Date(nowDate.getTime() + delayFromNow);
- setCacheExpirationDate(expirationDate);
+ this.delayFromNow = delayFromNow;
}
private void processActivationAction ()
