Remove ComponentScan duplicate condition

Closes gh-27077
2024-02-21 10:09:31 +01:00 · 2024-02-21 10:09:31 +01:00 · 871f705bca
parent 22b41c33ba
commit 871f705bca
1 changed files with 1 additions and 2 deletions
--- 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 @@ class ConfigurationClassParser {
 					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 =