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)));