From acc22b27457805f19d4d76eb991fa64101db9d6f Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 20 Mar 2008 20:11:34 +0000
Subject: [PATCH] SEC-722: Add Open ID Namespace Support
 http://jira.springframework.org/browse/SEC-722. Added check for
 MAIN_ENTRY_POINT bean when resolving entry points. If this has been set
 during parsing it will be used.

---
 .../security/config/HttpSecurityConfigPostProcessor.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java b/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java
index 973c8bf701..f90542cdb3 100644
--- a/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java
+++ b/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java
@@ -152,7 +152,11 @@ public class HttpSecurityConfigPostProcessor implements BeanFactoryPostProcessor
         if (entryPoints.size() == 1) {
             mainEntryPoint = (AuthenticationEntryPoint) entryPoints.get(0);
         } else {
-            mainEntryPoint = (AuthenticationEntryPoint) entryPointMap.get(BeanIds.FORM_LOGIN_ENTRY_POINT);
+            mainEntryPoint = (AuthenticationEntryPoint) entryPointMap.get(BeanIds.MAIN_ENTRY_POINT);
+            
+            if (mainEntryPoint == null) {
+            	mainEntryPoint = (AuthenticationEntryPoint) entryPointMap.get(BeanIds.FORM_LOGIN_ENTRY_POINT);
+            }
 
             if (mainEntryPoint == null) {
                 mainEntryPoint = (AuthenticationEntryPoint) entryPointMap.get(BeanIds.BASIC_AUTHENTICATION_ENTRY_POINT);