From 3e8de229be80ffec81303b71087d1e01ca5093ed Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 9 Dec 2008 14:30:37 +0000
Subject: [PATCH] Java5 updates.

---
 .../security/annotation/Jsr250Voter.java      | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/springframework/security/annotation/Jsr250Voter.java b/core/src/main/java/org/springframework/security/annotation/Jsr250Voter.java
index 86203ebf9a..8f35337c98 100644
--- a/core/src/main/java/org/springframework/security/annotation/Jsr250Voter.java
+++ b/core/src/main/java/org/springframework/security/annotation/Jsr250Voter.java
@@ -1,13 +1,12 @@
 package org.springframework.security.annotation;
 
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.Authentication;
-import org.springframework.security.vote.AccessDecisionVoter;
-
-import java.util.Iterator;
 import java.util.List;
 
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.vote.AccessDecisionVoter;
+
 /**
  * Voter on JSR-250 configuration attributes.
  *
@@ -45,12 +44,7 @@ public class Jsr250Voter implements AccessDecisionVoter {
      * @return The vote.
      */
     public int vote(Authentication authentication, Object object, List<ConfigAttribute> definition) {
-        int result = ACCESS_ABSTAIN;
-        Iterator iter = definition.iterator();
-
-        while (iter.hasNext()) {
-            ConfigAttribute attribute = (ConfigAttribute) iter.next();
-
+        for (ConfigAttribute attribute : definition) {
             if (Jsr250SecurityConfig.PERMIT_ALL_ATTRIBUTE.equals(attribute)) {
                 return ACCESS_GRANTED;
             }
@@ -60,18 +54,18 @@ public class Jsr250Voter implements AccessDecisionVoter {
             }
 
             if (supports(attribute)) {
-                result = ACCESS_DENIED;
-
                 // Attempt to find a matching granted authority
                 for (GrantedAuthority authority : authentication.getAuthorities()) {
                     if (attribute.getAttribute().equals(authority.getAuthority())) {
                         return ACCESS_GRANTED;
                     }
                 }
+                // No match - deny access
+                return ACCESS_DENIED;
             }
         }
 
-        return result;
+        return ACCESS_ABSTAIN;
     }
 }