svn commit: r1556724 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java

[tripod]

Author: tripod
Date: Thu Jan  9 05:37:45 2014
New Revision: 1556724

URL: http://svn.apache.org/r1556724
Log:
OAK-1311 Permission Cache causes non-deterministic access control test failures

- disabling cache for the moment

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java?rev=1556724&r1=1556723&r2=1556724&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java
 Thu Jan  9 05:37:45 2014
@@ -74,7 +74,7 @@ public class PermissionEntryCache {
             PrincipalPermissionEntries ppe = entries.get(principalName);
             if (ppe == null) {
                 ppe = store.load(principalName);
-                entries.put(principalName, ppe);
+//                entries.put(principalName, ppe);
             } else {
                 if (!verified.contains(principalName)) {
                     if (store.getTimestamp(principalName) != 
ppe.getTimestamp()) {
@@ -89,13 +89,13 @@ public class PermissionEntryCache {
             Currently this cache only handles entries for the Everyone 
principal.
             TODO: the cache should dynamically cache the principals that are 
used often.
             */
-            if (EveryonePrincipal.NAME.equals(principalName)) {
-                // check if base cache has the entries
-                PrincipalPermissionEntries baseppe = base.get(principalName);
-                if (baseppe == null || ppe.getTimestamp() > 
baseppe.getTimestamp()) {
-                    base.put(principalName, ppe);
-                }
-            }
+//            if (EveryonePrincipal.NAME.equals(principalName)) {
+//                // check if base cache has the entries
+//                PrincipalPermissionEntries baseppe = base.get(principalName);
+//                if (baseppe == null || ppe.getTimestamp() > 
baseppe.getTimestamp()) {
+//                    base.put(principalName, ppe);
+//                }
+//            }
             return ppe;
         }