diff options
| author | Brett Porter <brett@apache.org> | 2012-08-10 11:20:42 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2012-08-10 11:20:42 +0000 |
| commit | e5af660c27951ff6e3a7472f8327ffa6f2b38eed (patch) | |
| tree | 9f61843f1f673e738fc27b482ba3b4e63621e6f3 /redback-rbac | |
| parent | 83d4f636d2365c87ccd0af8e0ed60b164f859f4a (diff) | |
| download | archiva-e5af660c27951ff6e3a7472f8327ffa6f2b38eed.tar.gz archiva-e5af660c27951ff6e3a7472f8327ffa6f2b38eed.zip | |
[REDBACK-298] Concurrent modification to roles in Redback can cause incorrect
results to get cached
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1371658 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'redback-rbac')
| -rw-r--r-- | redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java index 9306f454d..9cea58a61 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java @@ -208,7 +208,7 @@ public class CachedRbacManager * @see org.apache.archiva.redback.rbac.RBACManager#getAssignedPermissionMap(java.lang.String) */ @SuppressWarnings( "unchecked" ) - public Map getAssignedPermissionMap( String principal ) + public synchronized Map getAssignedPermissionMap( String principal ) throws RbacObjectNotFoundException, RbacManagerException { Object el = userPermissionsCache.get( principal ); @@ -666,7 +666,7 @@ public class CachedRbacManager return this.rbacImpl.saveResource( resource ); } - public Role saveRole( Role role ) + public synchronized Role saveRole( Role role ) throws RbacObjectInvalidException, RbacManagerException { /* @@ -692,7 +692,7 @@ public class CachedRbacManager return this.rbacImpl.saveRole( role ); } - public void saveRoles( Collection<Role> roles ) + public synchronized void saveRoles( Collection<Role> roles ) throws RbacObjectInvalidException, RbacManagerException { |