Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use synchronized block only when data are not in the cache 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1373648 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-08-15 21:56:05 +00:00
parent 9fb355ff92
commit 4721790e70
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
View File

@ -207,7 +207,7 @@ public class CachedRbacManager
* @see org.apache.archiva.redback.rbac.RBACManager#getAssignedPermissionMap(java.lang.String) * @see org.apache.archiva.redback.rbac.RBACManager#getAssignedPermissionMap(java.lang.String)
*/ */
@SuppressWarnings( "unchecked" ) @SuppressWarnings( "unchecked" )
public synchronized Map<String, List<Permission>> getAssignedPermissionMap( String principal ) public Map<String, List<Permission>> getAssignedPermissionMap( String principal )
throws RbacObjectNotFoundException, RbacManagerException throws RbacObjectNotFoundException, RbacManagerException
{ {
Map<String, List<Permission>> el = (Map<String, List<Permission>>) userPermissionsCache.get( principal ); Map<String, List<Permission>> el = (Map<String, List<Permission>>) userPermissionsCache.get( principal );
@ -217,13 +217,14 @@ public class CachedRbacManager
log.debug( "using cached user permission map" ); log.debug( "using cached user permission map" );
return el; return el;
} }
else synchronized ( userPermissionsCache )
{ {
log.debug( "building user permission map" ); log.debug( "building user permission map" );
Map<String, List<Permission>> userPermMap = this.rbacImpl.getAssignedPermissionMap( principal ); Map<String, List<Permission>> userPermMap = this.rbacImpl.getAssignedPermissionMap( principal );
userPermissionsCache.put( principal, userPermMap ); userPermissionsCache.put( principal, userPermMap );
return userPermMap; return userPermMap;
} }
} }
public Set<Permission> getAssignedPermissions( String principal ) public Set<Permission> getAssignedPermissions( String principal )