From 4eafb3c90db5ded6ec7bb53598c8654ad467f15c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 22 Dec 2007 23:53:40 +0000 Subject: [PATCH] making it concurrency-safe git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@6388 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/security/Permission.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/security/Permission.java b/core/src/main/java/hudson/security/Permission.java index 82517acfb7..6187186d1c 100644 --- a/core/src/main/java/hudson/security/Permission.java +++ b/core/src/main/java/hudson/security/Permission.java @@ -1,9 +1,9 @@ package hudson.security; import java.util.List; -import java.util.ArrayList; import java.util.Map; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; /** * Permission, which represents activity that requires a security privilege. @@ -48,7 +48,7 @@ public class Permission { synchronized (PERMISSIONS) { List ps = PERMISSIONS.get(owner); if(ps==null) { - ps = new ArrayList(); + ps = new CopyOnWriteArrayList(); PERMISSIONS.put(owner,ps); } ps.add(this); @@ -71,12 +71,12 @@ public class Permission { /** * All the permissions in the system, keyed by their owners. */ - private static final Map> PERMISSIONS = new HashMap>(); + private static final Map> PERMISSIONS = new ConcurrentHashMap>(); /** * The same as {@link #PERMISSIONS} but in a single list. */ - private static final List ALL = new ArrayList(); + private static final List ALL = new CopyOnWriteArrayList(); // //