From 60de6314d4b3121c9f66041a1058b6e3b95fd354 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Mon, 17 Mar 2008 13:50:37 +0000
Subject: [PATCH] Replaced casting to check validity of provider list with call
 to Assert.isInstanceof.

---
 .../security/acl/AclProviderManager.java             | 12 ++----------
 .../security/acl/AclProviderManagerTests.java        |  4 ----
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/springframework/security/acl/AclProviderManager.java b/core/src/main/java/org/springframework/security/acl/AclProviderManager.java
index 6b24fe8566..e5565d64e2 100644
--- a/core/src/main/java/org/springframework/security/acl/AclProviderManager.java
+++ b/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;
diff --git a/core/src/test/java/org/springframework/security/acl/AclProviderManagerTests.java b/core/src/test/java/org/springframework/security/acl/AclProviderManagerTests.java
index eb76692ab4..083b04324d 100644
--- a/core/src/test/java/org/springframework/security/acl/AclProviderManagerTests.java
+++ b/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();