Author: peter_firmstone Date: Thu Dec 29 02:11:45 2011 New Revision: 1225412
URL: http://svn.apache.org/viewvc?rev=1225412&view=rev Log: River-323 Fix test failures caused by events not being received before timeouts, by increasing timeout. Modified: river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/loader/pref/PreferredClassLoader.java river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/PermissionComparator.java river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/delegates/DelegatePermission.java Modified: river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/loader/pref/PreferredClassLoader.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/loader/pref/PreferredClassLoader.java?rev=1225412&r1=1225411&r2=1225412&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/loader/pref/PreferredClassLoader.java (original) +++ river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/loader/pref/PreferredClassLoader.java Thu Dec 29 02:11:45 2011 @@ -1020,6 +1020,10 @@ public class PreferredClassLoader extend * After we retrieve the manifest, class bytes and * certificates, create the CodeSource we call * defineClass(String name, byte[]b, int off, int len, CodeSource cs) + * + * This will be utilised by a class that overrides + * BasicProxyPreparer.getPermissions() + * to retrieve the advisory permissions. */ return super.findClass(name); } Modified: river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/PermissionComparator.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/PermissionComparator.java?rev=1225412&r1=1225411&r2=1225412&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/PermissionComparator.java (original) +++ river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/PermissionComparator.java Thu Dec 29 02:11:45 2011 @@ -1,6 +1,7 @@ package net.jini.security; +import java.io.Serializable; import java.security.Permission; import java.util.Comparator; @@ -9,7 +10,8 @@ import java.util.Comparator; * * @author Peter Firmstone. */ -public class PermissionComparator implements Comparator<Permission> { +public class PermissionComparator implements Comparator<Permission>, Serializable { + private static final long serialVersionUID = 1L; public int compare(Permission o1, Permission o2) { if (o1 == o2) return 0; Modified: river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/delegates/DelegatePermission.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/delegates/DelegatePermission.java?rev=1225412&r1=1225411&r2=1225412&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/delegates/DelegatePermission.java (original) +++ river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/delegates/DelegatePermission.java Thu Dec 29 02:11:45 2011 @@ -27,6 +27,7 @@ import java.security.Permission; import java.security.PermissionCollection; import java.security.Permissions; import java.util.Collections; +import java.util.Comparator; import java.util.Enumeration; import java.util.HashSet; import java.util.Set; @@ -89,11 +90,11 @@ public final class DelegatePermission ex * optimum AccessControlContext result caching and minimises memory * consumption. */ - private static final ConcurrentMap<Permission,DelegatePermission> instances - = RC.concurrentMap( - new ConcurrentSkipListMap<Referrer<Permission>,Referrer<DelegatePermission>>( - RC.comparator( new PermissionComparator() ) - ), Ref.WEAK, Ref.WEAK ); // Value weak too, because it references key. + @SuppressWarnings("unchecked") + private static final ConcurrentMap instances + = RC.concurrentMap( new ConcurrentSkipListMap( + RC.comparator( new PermissionComparator())) + , Ref.WEAK, Ref.WEAK ); // Value weak too, because it references key. /** * Factory method to obtain a DelegatePermission, this is essential to @@ -104,10 +105,11 @@ public final class DelegatePermission ex * @return DelegatePermission */ public static Permission get(Permission p){ - DelegatePermission del = instances.get(p); + Permission del = (Permission) instances.get(p); if ( del == null ){ del = new DelegatePermission(p); - DelegatePermission existed = instances.putIfAbsent(p, del); + @SuppressWarnings("unchecked") + Permission existed = (Permission) instances.putIfAbsent(p, del); if ( existed != null ){ del = existed; }
