You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2013/10/07 19:52:38 UTC
svn commit: r1530011 - in /jackrabbit/branches/2.4: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java
Author: jukka
Date: Mon Oct 7 17:52:38 2013
New Revision: 1530011
URL: http://svn.apache.org/r1530011
Log:
2.4: Merged revision 1530005 (JCR-3678)
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1530005
Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java?rev=1530011&r1=1530010&r2=1530011&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java Mon Oct 7 17:52:38 2013
@@ -57,9 +57,10 @@ public class MembershipCache implements
private static final Logger log = LoggerFactory.getLogger(MembershipCache.class);
/**
- * The maximum size of this cache (TODO: make configurable)
+ * The maximum size of this cache
*/
- private static final int MAX_CACHE_SIZE = 5000;
+ private static final int MAX_CACHE_SIZE =
+ Integer.getInteger("org.apache.jackrabbit.MembershipCache", 5000);
private final SessionImpl systemSession;
private final String groupsPath;
@@ -67,7 +68,6 @@ public class MembershipCache implements
private final String pMembers;
private final ConcurrentCache<String, Collection<String>> cache;
- @SuppressWarnings("unchecked")
MembershipCache(SessionImpl systemSession, String groupsPath, boolean useMembersNode) throws RepositoryException {
this.systemSession = systemSession;
this.groupsPath = (groupsPath == null) ? UserConstants.GROUPS_PATH : groupsPath;