r1098 - xwiki/trunk/src/main/java/com/xpn/xwiki

[Ludovic Dubost]

Author: ludovic
Date: 2006-07-31 01:46:51 +0200 (Mon, 31 Jul 2006)
New Revision: 1098

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
Log:
Transformed all caches to XWikiCache
Move virtual wiki cache to XWikiCache, limited by default to 1000 items
Allow caches to be completely deleted on flushAll
Allow clustered cache to only use one jgroups notification bus
Updated oscache to a lightly modified version of oscache



Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-07-30 23:27:07 UTC (rev 1097)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-07-30 23:46:51 UTC (rev 1098)
@@ -1411,8 +1411,10 @@
         // We need to flush the virtual wiki list
         virtualWikiList = new ArrayList();
         // We need to flush the server Cache
-        virtualWikiMap.flushAll();
-        virtualWikiMap = null;
+        if (virtualWikiMap!=null) {
+            virtualWikiMap.flushAll();
+            virtualWikiMap = null;
+        }
 
         // We need to flush the group service cache
         if (groupService != null)