You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2008/03/31 22:25:11 UTC

svn commit: r643129 - /portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java

Author: ate
Date: Mon Mar 31 13:25:06 2008
New Revision: 643129

URL: http://svn.apache.org/viewvc?rev=643129&view=rev
Log:
Reloading the Spring container with different DatabasePageManager settings for things like constraints/permissions and alike didn't work as the DatabasePageManagerCache only would initialize once.

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java?rev=643129&r1=643128&r2=643129&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java Mon Mar 31 13:25:06 2008
@@ -55,17 +55,18 @@
      */
     public synchronized static void cacheInit(DatabasePageManager dbPageManager)
     {
-        if (pageManager == null)
+        if (pageManager != null)
         {
-            cacheByOID = new HashMap();
-            cacheLRUList = new LinkedList();
-            cacheByPath = new HashMap();
-            cacheSize = dbPageManager.getCacheSize();
-            cacheExpiresSeconds = dbPageManager.getCacheExpiresSeconds();
-            constraintsEnabled = dbPageManager.getConstraintsEnabled();
-            permissionsEnabled = dbPageManager.getPermissionsEnabled();
-            pageManager = dbPageManager;
+            cacheClear();
         }
+        cacheByOID = new HashMap();
+        cacheLRUList = new LinkedList();
+        cacheByPath = new HashMap();
+        cacheSize = dbPageManager.getCacheSize();
+        cacheExpiresSeconds = dbPageManager.getCacheExpiresSeconds();
+        constraintsEnabled = dbPageManager.getConstraintsEnabled();
+        permissionsEnabled = dbPageManager.getPermissionsEnabled();
+        pageManager = dbPageManager;
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org