Author: mcardle
Date: Mon Aug 14 08:44:11 2006
New Revision: 308
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=308&repname=esi_server
Log:
* (Continued) support for aclGroup template sharing and other things
Modified:
trunk/src/org/jahia/esi/GetThread.java
Modified: trunk/src/org/jahia/esi/GetThread.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/src/org/jahia/esi/GetThread.java&rev=308&repname=esi_server
==============================================================================
--- trunk/src/org/jahia/esi/GetThread.java (original)
+++ trunk/src/org/jahia/esi/GetThread.java Mon Aug 14 08:44:11 2006
@@ -770,7 +770,7 @@
|| //AggregatePageOnTheFly=true but entry is for
user 'guest' (i.e. no cookie marker in UrlKey) -since we want to keep these
whole in cache-
(SettingsBean.getInstance().isAggregateLoggedUserPagesOnTheFly()
&&
Utils.getUserCookieValue(clientRequest)==null)
- || aclGroupSharedTemplate //no need to do this
if it's an aclGrouped shared template //TODO: review this is we give precedence
to OnTheFly instead
+ || !aclGroupSharedTemplate //no need to do this
if it's an aclGrouped shared template //TODO: review this is we give precedence
to OnTheFly instead
) ) {
//TODO: sanity check, this should not be necessary
if (tagCacheObject==null) {
@@ -847,6 +847,13 @@
String urlToServer = methodToServer.getURI().toString();
+ if (fetchingSkeleton
+ && SettingsBean.getInstance().isEnableTemplateCaching()
+ && !aclGroupSharedTemplate //TODO: review this is we give
precedence to OnTheFly instead
+ ) {
+ //TODO: regenerate key so that it is for the current user and
not an aclGroup one
+ }
+
//Reset expiration to 0 so that it isn't stored in the cache
// due to presence of /cache/ param in url
if (Utils.isCacheUrlParamPresent(urlToServer)) {
