From 3b13a3fb2534b63bd4d813c02b391818fb52b119 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 2 Nov 2011 14:23:59 +0000
Subject: [PATCH] SEC-1812: Replace assertion with warning message when
 overriding the global AuthenticationManager.

---
 .../AuthenticationManagerBeanDefinitionParser.java           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java
index f49bf01483..e576cf4c27 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java
@@ -41,8 +41,9 @@ public class AuthenticationManagerBeanDefinitionParser implements BeanDefinition
         String id = element.getAttribute("id");
 
         if (!StringUtils.hasText(id)) {
-            Assert.state(!pc.getRegistry().containsBeanDefinition(BeanIds.AUTHENTICATION_MANAGER),
-                "Global AuthenticationManager has already been registered!");
+            if (pc.getRegistry().containsBeanDefinition(BeanIds.AUTHENTICATION_MANAGER)) {
+                pc.getReaderContext().warning("Overriding globally registered AuthenticationManager", pc.extractSource(element));
+            }
             id = BeanIds.AUTHENTICATION_MANAGER;
         }
         pc.pushContainingComponent(new CompositeComponentDefinition(element.getTagName(), pc.extractSource(element)));