Remove ComponentScan duplicate condition

snicoll · snicoll · commit 871f705bca8d · 2024-02-21T10:09:31.000+01:00
Closes gh-27077
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
@@ -313,8 +313,7 @@ protected final SourceClass doProcessConfigurationClass(
 					ComponentScan.class, ComponentScans.class, MergedAnnotation::isMetaPresent);
 		}
 
-		if (!componentScans.isEmpty() &&
-				!this.conditionEvaluator.shouldSkip(sourceClass.getMetadata(), ConfigurationPhase.REGISTER_BEAN)) {
+		if (!componentScans.isEmpty()) {
 			for (AnnotationAttributes componentScan : componentScans) {
 				// The config class is annotated with @ComponentScan -> perform the scan immediately
 				Set<BeanDefinitionHolder> scannedBeanDefinitions =

Original file line number	Diff line number	Diff line change
`@@ -313,8 +313,7 @@ protected final SourceClass doProcessConfigurationClass(`
`313`	`313`	`ComponentScan.class, ComponentScans.class, MergedAnnotation::isMetaPresent);`
`314`	`314`	`}`
`315`	`315`
`316`		`- if (!componentScans.isEmpty() &&`
`317`		`- !this.conditionEvaluator.shouldSkip(sourceClass.getMetadata(), ConfigurationPhase.REGISTER_BEAN)) {`
	`316`	`+ if (!componentScans.isEmpty()) {`
`318`	`317`	`for (AnnotationAttributes componentScan : componentScans) {`
`319`	`318`	`// The config class is annotated with @ComponentScan -> perform the scan immediately`
`320`	`319`	`Set<BeanDefinitionHolder> scannedBeanDefinitions =`