root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Remove ComponentScan duplicate condition 

Closes gh-27077
This commit is contained in:
Stéphane Nicoll 2024-02-21 10:09:31 +01:00
parent 22b41c33ba
commit 871f705bca
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
View File

@ -313,8 +313,7 @@ class ConfigurationClassParser {
ComponentScan.class, ComponentScans.class, MergedAnnotation::isMetaPresent); ComponentScan.class, ComponentScans.class, MergedAnnotation::isMetaPresent);
} }
if (!componentScans.isEmpty() && if (!componentScans.isEmpty()) {
!this.conditionEvaluator.shouldSkip(sourceClass.getMetadata(), ConfigurationPhase.REGISTER_BEAN)) {
for (AnnotationAttributes componentScan : componentScans) { for (AnnotationAttributes componentScan : componentScans) {
// The config class is annotated with @ComponentScan -> perform the scan immediately // The config class is annotated with @ComponentScan -> perform the scan immediately
Set<BeanDefinitionHolder> scannedBeanDefinitions = Set<BeanDefinitionHolder> scannedBeanDefinitions =