You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2018/02/01 15:15:08 UTC
svn commit: r1822881 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission:
PermissionEntryCache.java PermissionEntryProviderImpl.java
Author: angela
Date: Thu Feb 1 15:15:07 2018
New Revision: 1822881
URL: http://svn.apache.org/viewvc?rev=1822881&view=rev
Log:
OAK-7231 : Remove PermissionEntryCache.getNumEntries
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.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=1822881&r1=1822880&r2=1822881&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 Feb 1 15:15:07 2018
@@ -95,15 +95,6 @@ class PermissionEntryCache {
}
}
- long getNumEntries(@Nonnull PermissionStore store,
- @Nonnull String principalName,
- long max) {
- PrincipalPermissionEntries ppe = entries.get(principalName);
- return ppe == null
- ? store.getNumEntries(principalName, max)
- : ppe.getEntries().size();
- }
-
void flush(@Nonnull Set<String> principalNames) {
entries.keySet().removeAll(principalNames);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java?rev=1822881&r1=1822880&r2=1822881&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java Thu Feb 1 15:15:07 2018
@@ -75,7 +75,7 @@ class PermissionEntryProviderImpl implem
long cnt = 0;
existingNames.clear();
for (String name : principalNames) {
- long n = cache.getNumEntries(store, name, maxSize);
+ long n = store.getNumEntries(name, maxSize);
/*
if cache.getNumEntries (n) returns a number bigger than 0, we
remember this principal name int the 'existingNames' set