[MMBASE SCM] r41279 - in CMSContainer: branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase

[nico]

Author: nico
Date: 2010-03-05 15:22:47 +0100 (Fri, 05 Mar 2010)
New Revision: 41279

Modified:
   
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java
   
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TreePathCache.java
   
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java
   
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TreePathCache.java
Log:
CMSC-1653 clear tree path cache when sitecache is reset

Modified: 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java
===================================================================
--- 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java
 2010-03-05 14:17:27 UTC (rev 41278)
+++ 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java
 2010-03-05 14:22:47 UTC (rev 41279)
@@ -27,6 +27,7 @@
 import org.mmbase.security.UserContext;
 
 import com.finalist.cmsc.beans.om.*;
+import com.finalist.cmsc.mmbase.TreePathCache;
 import com.finalist.cmsc.services.Properties;
 import com.finalist.cmsc.services.security.LoginSession;
 import com.finalist.cmsc.util.ServerUtil;
@@ -399,5 +400,6 @@
    @Override
    public void resetSiteCache() {
       SiteModelManager.getInstance().resetSiteCache();
+      TreePathCache.clearAllCaches();
    }
 }

Modified: 
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TreePathCache.java
===================================================================
--- 
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TreePathCache.java
 2010-03-05 14:17:27 UTC (rev 41278)
+++ 
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TreePathCache.java
 2010-03-05 14:22:47 UTC (rev 41279)
@@ -48,6 +48,12 @@
         replaceCache(getCache(nodeManagerName), node, newPath);
     }
 
+    public static void clearAllCaches() {
+       synchronized (treeCaches) {
+          treeCaches.clear();
+       }
+    }
+
     private static BidiMap getCache(String nodeManagerName) {
         synchronized (treeCaches) {
             if (treeCaches.containsKey(nodeManagerName)) {

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java
 2010-03-05 14:17:27 UTC (rev 41278)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java
 2010-03-05 14:22:47 UTC (rev 41279)
@@ -27,6 +27,7 @@
 import org.mmbase.security.UserContext;
 
 import com.finalist.cmsc.beans.om.*;
+import com.finalist.cmsc.mmbase.TreePathCache;
 import com.finalist.cmsc.services.Properties;
 import com.finalist.cmsc.services.security.LoginSession;
 import com.finalist.cmsc.util.ServerUtil;
@@ -399,5 +400,6 @@
    @Override
    public void resetSiteCache() {
       SiteModelManager.getInstance().resetSiteCache();
+      TreePathCache.clearAllCaches();
    }
 }

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TreePathCache.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TreePathCache.java
 2010-03-05 14:17:27 UTC (rev 41278)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TreePathCache.java
 2010-03-05 14:22:47 UTC (rev 41279)
@@ -48,6 +48,12 @@
         replaceCache(getCache(nodeManagerName), node, newPath);
     }
 
+    public static void clearAllCaches() {
+       synchronized (treeCaches) {
+          treeCaches.clear();
+       }
+    }
+
     private static BidiMap getCache(String nodeManagerName) {
         synchronized (treeCaches) {
             if (treeCaches.containsKey(nodeManagerName)) {

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs