Author: mcardle
Date: Thu Aug 17 07:11:27 2006
New Revision: 14924
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14924&repname=jahia
Log:
* faster flush all
Modified:
trunk/core/src/java/org/jahia/services/esi/EsiService.java
Modified: trunk/core/src/java/org/jahia/services/esi/EsiService.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/services/esi/EsiService.java&rev=14924&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/services/esi/EsiService.java (original)
+++ trunk/core/src/java/org/jahia/services/esi/EsiService.java Thu Aug 17
07:11:27 2006
@@ -619,7 +619,11 @@
if (logger.isDebugEnabled())
logger.debug("[esi]: Resetting All Template/Fragment FirstExecute
and AclUserNames.");
try {
- //TODO: replace this with a clear all
+ //Just remove everything in one go
+ cache.remove("/");
+ clearAllContentToInvalidate();
+
+ /* //TODO: replace this with a clear all
Iterator fragsIterator = getAllFragmentsIterator(); //TODO: might
be very slow for large sites
while (fragsIterator.hasNext()) {
Fragment frg = (Fragment) fragsIterator.next();
@@ -639,6 +643,8 @@
}
}
}
+ */
+
} catch (CacheException ex) {
printTreeCacheError(ex);
}
@@ -1908,13 +1914,11 @@
}
}
//remove all tagged keys
- //TODO: sync not necessary with ConcurrentHashMap, remove
- synchronized (contentToInvalidate) {
- for (int i = 0; i < keysToRemove.size(); i++) {
- String s = (String) keysToRemove.get(i);
- contentToInvalidate.remove(s);
- }
+ for (int i = 0; i < keysToRemove.size(); i++) {
+ String s = (String) keysToRemove.get(i);
+ contentToInvalidate.remove(s);
}
+
}
/**
