river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r981518 - /incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/se/DynamicConcurrentPolicyProvider.java
Date Mon, 02 Aug 2010 14:20:27 GMT
Author: peter_firmstone
Date: Mon Aug  2 14:20:26 2010
New Revision: 981518

URL: http://svn.apache.org/viewvc?rev=981518&view=rev
Log:
Check for null Permission references

Modified:
    incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/se/DynamicConcurrentPolicyProvider.java

Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/se/DynamicConcurrentPolicyProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/se/DynamicConcurrentPolicyProvider.java?rev=981518&r1=981517&r2=981518&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/se/DynamicConcurrentPolicyProvider.java
(original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/se/DynamicConcurrentPolicyProvider.java
Mon Aug  2 14:20:26 2010
@@ -511,6 +511,7 @@ public class DynamicConcurrentPolicyProv
         while (grantsItr.hasNext()){
             PermissionGrant grant = grantsItr.next();
             Permission[] perms = grant.getPermissions().clone();
+	    checkNullElements(perms);
             AccessController.checkPermission(new GrantPermission(perms));
 	    allowed.put(grant, perms);
         }
@@ -568,12 +569,7 @@ public class DynamicConcurrentPolicyProv
 	    }
 	    PermissionGrant[] updated = new PermissionGrant[holder.size()];
 	    pGrants = holder.toArray(updated);
-	}
-//        try {
-//            wl.lock();
-//            dynamicGrants.removeAll(grants);
-//        } finally {wl.unlock();}
-//        cache.clear();	
+	}	
     }
 
     public List<PermissionGrant> getPermissionGrants() {



Mime
View raw message