|
|
|
|
@ -1,5 +1,5 @@
@@ -1,5 +1,5 @@
|
|
|
|
|
/* |
|
|
|
|
* Copyright 2002-2023 the original author or authors. |
|
|
|
|
* Copyright 2002-2024 the original author or authors. |
|
|
|
|
* |
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
|
@ -39,7 +39,6 @@ import org.springframework.beans.factory.support.AbstractBeanDefinitionReader;
@@ -39,7 +39,6 @@ import org.springframework.beans.factory.support.AbstractBeanDefinitionReader;
|
|
|
|
|
import org.springframework.beans.factory.support.BeanDefinitionReader; |
|
|
|
|
import org.springframework.beans.factory.support.BeanDefinitionRegistry; |
|
|
|
|
import org.springframework.beans.factory.support.BeanNameGenerator; |
|
|
|
|
import org.springframework.beans.factory.support.DefaultListableBeanFactory; |
|
|
|
|
import org.springframework.beans.factory.support.RootBeanDefinition; |
|
|
|
|
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; |
|
|
|
|
import org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase; |
|
|
|
|
@ -318,7 +317,7 @@ class ConfigurationClassBeanDefinitionReader {
@@ -318,7 +317,7 @@ class ConfigurationClassBeanDefinitionReader {
|
|
|
|
|
|
|
|
|
|
// At this point, it's a top-level override (probably XML), just having been parsed
|
|
|
|
|
// before configuration class processing kicks in...
|
|
|
|
|
if (this.registry instanceof DefaultListableBeanFactory dlbf && !dlbf.isBeanDefinitionOverridable(beanName)) { |
|
|
|
|
if (!this.registry.isBeanDefinitionOverridable(beanName)) { |
|
|
|
|
throw new BeanDefinitionStoreException(beanMethod.getConfigurationClass().getResource().getDescription(), |
|
|
|
|
beanName, "@Bean definition illegally overridden by existing bean definition: " + existingBeanDef); |
|
|
|
|
} |
|
|
|
|
|