mcardle 2005/12/23 01:40:58 CET
Modified files:
src/org/jahia/esi GetThread.java
Log:
* now doesn't store cache/off/ version of page since cache/off is propagated.
Does the same for cache/offonce/ for the moment because cache/offonce is
propagated -when it shouldn't.
Revision Changes Path
1.16 +9 -0 esi_server/src/org/jahia/esi/GetThread.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/org/jahia/esi/GetThread.java.diff?r1=1.15&r2=1.16&f=h
Index: GetThread.java
===================================================================
RCS file: /home/cvs/repository/esi_server/src/org/jahia/esi/GetThread.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- GetThread.java 14 Dec 2005 16:38:22 -0000 1.15
+++ GetThread.java 23 Dec 2005 00:40:57 -0000 1.16
@@ -501,6 +501,15 @@
//rewrite (or add) the associated cache entry which doesn't
// contain the "/cache/offonce" or "/cache/offonce" parameter
// in its URL, and still keep current expirations
+
+ //TODO: Temporary modification (DELETE THIS EVENTUALLY):
+ this.expirationInSecs = 4;
+ this.expirationDateInSecs = 4; //TODO: ==> means that the entry
below will be reset
+ //TODO: did this because cached version of /cache/off and
/cache/offonce/ (although it shouldn't for offonce)
+ //TODO: contain URLs with cache param also. So either need to do
URL rewriting
+ //TODO: on all the page's content + fragments, or just forget
about caching it altogether as we do here.
+ //TODO: could do it with cache/offonce but currently there's a
bug and cache/offonce is propagated
+
boolean isCacheOffOnce = Utils.isCacheOffOnce(urlToServer);
boolean isCacheOff = Utils.isCacheOff(urlToServer);
if (isCacheOffOnce || isCacheOff ) {