From 8ce6c73802c003417457d0a531e9a74b2fa0455e Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Fri, 19 Aug 2011 15:23:02 -0700
Subject: [PATCH] Add check for empty attributes list as well as null, in
 DelegatingMethodSecurityMetadataSource

---
 .../access/method/DelegatingMethodSecurityMetadataSource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
index b522f8ab94..e84720adac 100644
--- a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
@@ -53,7 +53,7 @@ public final class DelegatingMethodSecurityMetadataSource extends AbstractMethod
             Collection<ConfigAttribute> attributes = null;
             for (MethodSecurityMetadataSource s : methodSecurityMetadataSources) {
                 attributes = s.getAttributes(method, targetClass);
-                if (attributes != null) {
+                if (attributes != null && !attributes.isEmpty()) {
                     break;
                 }
             }