From 4b4d4d33326965edc36d5c48e1fa09fe8c8fea69 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 16 Feb 2006 01:11:31 +0000
Subject: [PATCH] Added some uses of Spring Assert class and removed one to
 prevent unnecessary StringBuffer creation.

---
 .../AbstractSecurityInterceptor.java          | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/acegisecurity/intercept/AbstractSecurityInterceptor.java b/core/src/main/java/org/acegisecurity/intercept/AbstractSecurityInterceptor.java
index 9b34a5f824..79311d1f90 100644
--- a/core/src/main/java/org/acegisecurity/intercept/AbstractSecurityInterceptor.java
+++ b/core/src/main/java/org/acegisecurity/intercept/AbstractSecurityInterceptor.java
@@ -210,30 +210,24 @@ public abstract class AbstractSecurityInterceptor implements InitializingBean,
         Assert.notNull(this.obtainObjectDefinitionSource(),
             "An ObjectDefinitionSource is required");
 
-        if (!this.obtainObjectDefinitionSource()
-                 .supports(getSecureObjectClass())) {
-            throw new IllegalArgumentException(
+        Assert.isTrue(this.obtainObjectDefinitionSource()
+                .supports(getSecureObjectClass()),
                 "ObjectDefinitionSource does not support secure object class: "
-                + getSecureObjectClass());
-        }
+                + getSecureObjectClass()
+                );
 
-        if (!this.runAsManager.supports(getSecureObjectClass())) {
-            throw new IllegalArgumentException(
+        Assert.isTrue(this.runAsManager.supports(getSecureObjectClass()),
                 "RunAsManager does not support secure object class: "
-                + getSecureObjectClass());
-        }
+                + getSecureObjectClass() );
 
-        if (!this.accessDecisionManager.supports(getSecureObjectClass())) {
-            throw new IllegalArgumentException(
+        Assert.isTrue(this.accessDecisionManager.supports(getSecureObjectClass()),
                 "AccessDecisionManager does not support secure object class: "
                 + getSecureObjectClass());
-        }
 
-        if ((this.afterInvocationManager != null)
-            && !this.afterInvocationManager.supports(getSecureObjectClass())) {
-            throw new IllegalArgumentException(
-                "AfterInvocationManager does not support secure object class: "
-                + getSecureObjectClass());
+        if (this.afterInvocationManager != null) {
+            Assert.isTrue(this.afterInvocationManager.supports(getSecureObjectClass()),
+                    "AfterInvocationManager does not support secure object class: "
+                    + getSecureObjectClass());
         }
 
         if (this.validateConfigAttributes) {
@@ -281,12 +275,13 @@ public abstract class AbstractSecurityInterceptor implements InitializingBean,
 
     protected InterceptorStatusToken beforeInvocation(Object object) {
         Assert.notNull(object, "Object was null");
-        Assert.isTrue(getSecureObjectClass()
-                          .isAssignableFrom(object.getClass()),
-            "Security invocation attempted for object "
+
+        if(!getSecureObjectClass().isAssignableFrom(object.getClass())) {
+            throw new IllegalArgumentException ("Security invocation attempted for object "
             + object.getClass().getName()
             + " but AbstractSecurityInterceptor only configured to support secure objects of type: "
             + getSecureObjectClass());
+        }
 
         ConfigAttributeDefinition attr = this.obtainObjectDefinitionSource()
                                              .getAttributes(object);