Author: bpapez
Date: Tue Nov 13 11:55:12 2007
New Revision: 19130

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19130&repname=
=3Djahia
Log:
Optimize ACL preloading

Modified:
    branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/acl/JahiaACLManag=
erService.java

Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/acl/JahiaAC=
LManagerService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/acl/JahiaACLManagerService.java&rev=3D1913=
0&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/acl/JahiaACLManag=
erService.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/acl/JahiaACLManag=
erService.java Tue Nov 13 11:55:12 2007
@@ -136,11 +136,14 @@
 =

         int preloadCount =3D this.jSettings.getAclPreloadCount ();
 =

-        logger.debug ("Preloading " + preloadCount + " ACLs from the datab=
ase");
         try {
-            mDBUtils.preloadACLs (preloadCount, mACLCache);
+            if (preloadCount > 0) {
+                logger.debug ("Preloading " + preloadCount + " ACLs from t=
he database");     =

+                mDBUtils.preloadACLs (preloadCount, mACLCache);
+            }    =

             mDBUtils.preloadPageACLs(mACLCache);
-            mDBUtils.preloadPageFieldACLs(mACLCache);
+//            Page Field ACLs in containers are not used anymore, therefor=
e preload is not interesting anymore            =

+//            mDBUtils.preloadPageFieldACLs(mACLCache);
             mDBUtils.preloadContainerListACLs(mACLCache);
         } catch (JahiaException je) {
             String msg =3D "Error while preloading ACLs into cache";

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to