Browse Source

SEC-1812: Replace assertion with warning message when overriding the global AuthenticationManager.

pull/1/head
Luke Taylor 14 years ago
parent
commit
3b13a3fb25
  1. 5
      config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java

5
config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java

@ -41,8 +41,9 @@ public class AuthenticationManagerBeanDefinitionParser implements BeanDefinition @@ -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)));

Loading…
Cancel
Save