diff --git a/core/src/main/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSource.java b/core/src/main/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSource.java
index c332f31dea..ffd5872725 100644
--- a/core/src/main/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSource.java
+++ b/core/src/main/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSource.java
@@ -111,10 +111,11 @@ public abstract class AbstractFilterInvocationDefinitionSource implements Filter
             }
         }
 
-        Iterator patterns = requestMap.keySet().iterator();
+        Iterator entries = requestMap.entrySet().iterator();
 
-        while (patterns.hasNext()) {
-            Object p = patterns.next();            
+        while (entries.hasNext()) {
+            Map.Entry entry = (Map.Entry) entries.next();
+            Object p = entry.getKey();
             boolean matched = urlMatcher.pathMatchesUrl(p, url);
 
             if (logger.isDebugEnabled()) {
@@ -122,7 +123,7 @@ public abstract class AbstractFilterInvocationDefinitionSource implements Filter
             }
 
             if (matched) {
-                return (ConfigAttributeDefinition) getRequestMap().get(p);
+                return (ConfigAttributeDefinition) entry.getValue();
             }
         }
 
diff --git a/core/src/test/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java b/core/src/test/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
index 4f3408fb20..9e8843b308 100644
--- a/core/src/test/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
@@ -47,14 +47,6 @@ public class AbstractFilterInvocationDefinitionSourceTests extends TestCase {
 
     //~ Methods ========================================================================================================
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AbstractFilterInvocationDefinitionSourceTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
     public void testDoesNotSupportAnotherObject() {
         MockFilterInvocationDefinitionSource mfis = new MockFilterInvocationDefinitionSource(false, true);
         assertFalse(mfis.supports(String.class));