cmailleux 2005/03/30 11:54:59 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/params ParamBean.java
Log:
Initialize delayfromNow at -1 to correctly handle expirationdelay = 0
Revision Changes Path
1.149.2.9.2.6 +12 -2 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.2.5&r2=1.149.2.9.2.6&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.2.5
retrieving revision 1.149.2.9.2.6
diff -u -r1.149.2.9.2.5 -r1.149.2.9.2.6
--- ParamBean.java 29 Mar 2005 15:33:01 -0000 1.149.2.9.2.5
+++ ParamBean.java 30 Mar 2005 09:54:58 -0000 1.149.2.9.2.6
@@ -301,7 +301,7 @@
private int diffVersionID = 0;
private ArrayList pageURLKeys = new ArrayList();
- private long delayFromNow;
+ private long delayFromNow=-1;
static {
/** @todo we might want to put this in a configuration file so the
@@ -2818,7 +2818,7 @@
public java.util.Date getCacheExpirationDate () {
if(cacheExpirationDate!=null)
return cacheExpirationDate;
- else if(delayFromNow!=0) {
+ else if(delayFromNow>-1) {
return new Date(System.currentTimeMillis() + delayFromNow);
}
return null;
@@ -2846,6 +2846,16 @@
this.delayFromNow = delayFromNow;
}
+ /**
+ * Gets the current page's cache expiration delay, starting from the
current
+ * locale time.
+ * @param delayFromNow an long value specifying the delay in milliseconds
+ * from now for the expiration of the current page's cache.
+ */
+ final public long getCacheExpirationDelay () {
+ return delayFromNow;
+ }
+
private void processActivationAction ()
throws JahiaException {
// read validate as parameter
