Author: peter_firmstone Date: Wed Jan 11 12:34:43 2012 New Revision: 1229982
URL: http://svn.apache.org/viewvc?rev=1229982&view=rev Log: River-323. Replace Permissions with ConcurrentPermissions in DynamicPolicyProvider Modified: river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/policy/DynamicPolicyProvider.java Modified: river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/policy/DynamicPolicyProvider.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/policy/DynamicPolicyProvider.java?rev=1229982&r1=1229981&r2=1229982&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/policy/DynamicPolicyProvider.java (original) +++ river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/policy/DynamicPolicyProvider.java Wed Jan 11 12:34:43 2012 @@ -19,9 +19,7 @@ package net.jini.security.policy; import java.io.IOException; -import java.lang.ref.Reference; import java.rmi.RemoteException; -import java.security.PrivilegedActionException; import org.apache.river.api.security.DelegateSecurityManager; import java.security.AccessController; import java.security.AllPermission; @@ -33,14 +31,12 @@ import java.security.Permissions; import java.security.Policy; import java.security.Principal; import java.security.PrivilegedAction; -import java.security.PrivilegedExceptionAction; import java.security.ProtectionDomain; import java.security.Security; import java.security.UnresolvedPermission; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.Enumeration; import java.util.HashSet; @@ -49,15 +45,9 @@ import java.util.List; import java.util.NavigableSet; import java.util.Set; import java.util.TreeSet; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Level; import java.util.logging.Logger; +import net.jini.security.ConcurrentPermissions; import net.jini.security.GrantPermission; import net.jini.security.PermissionComparator; import org.apache.river.api.security.PermissionGrant; @@ -65,11 +55,7 @@ import org.apache.river.api.security.Per import org.apache.river.api.security.policy.RemotePolicy; import org.apache.river.api.security.PolicyPermission; import org.apache.river.api.security.policy.RevokeableDynamicPolicy; -import org.apache.river.impl.security.policy.util.PolicyUtils; import org.apache.river.impl.util.CollectionsConcurrent; -import org.apache.river.impl.util.RC; -import org.apache.river.impl.util.Ref; -import org.apache.river.impl.util.Referrer; /** * Security policy provider that supports dynamic granting of permissions at @@ -439,7 +425,7 @@ Put the policy providers and all referen } private PermissionCollection convert(NavigableSet<Permission> permissions){ - PermissionCollection pc = new Permissions(); + PermissionCollection pc = new ConcurrentPermissions(); // The descending iterator is for SocketPermission. Iterator<Permission> it = permissions.descendingIterator(); while (it.hasNext()) { @@ -665,7 +651,6 @@ Put the policy providers and all referen int l = grantsRefCopy.length; for ( int i = 0; i < l; i++){ if (grantsRefCopy[i].implies(domain)) { - // We only trust grantCache in case of mutable PermissionGrant. Collection<Permission> perms = grantsRefCopy[i].getPermissions(); Iterator<Permission> it = perms.iterator(); while (it.hasNext()){
