Browse Source

Replaced casting to check validity of provider list with call to Assert.isInstanceof.

Luke Taylor 17 năm trước cách đây
mục cha
commit
60de6314d4

+ 2 - 10
core/src/main/java/org/springframework/security/acl/AclProviderManager.java

@@ -125,16 +125,8 @@ public class AclProviderManager implements AclManager, InitializingBean {
         Iterator iter = newList.iterator();
 
         while (iter.hasNext()) {
-            Object currentObject = null;
-
-            try {
-                currentObject = iter.next();
-
-                AclProvider attemptToCast = (AclProvider) currentObject;
-            } catch (ClassCastException cce) {
-                throw new IllegalArgumentException("AclProvider " + currentObject.getClass().getName()
-                    + " must implement AclProvider");
-            }
+            Object currentObject = iter.next();
+            Assert.isInstanceOf(AclProvider.class, currentObject, "Invalid Acl Provider. ");
         }
 
         this.providers = newList;

+ 0 - 4
core/src/test/java/org/springframework/security/acl/AclProviderManagerTests.java

@@ -49,10 +49,6 @@ public class AclProviderManagerTests extends TestCase {
 
     //~ Methods ========================================================================================================
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AclProviderManagerTests.class);
-    }
-
     private AclProviderManager makeProviderManager() {
         MockProvider provider1 = new MockProvider();
         List providers = new Vector();