From 871f705bca8da88c95966b9ab37d9aefa0dd24ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 21 Feb 2024 10:09:31 +0100 Subject: [PATCH] Remove ComponentScan duplicate condition Closes gh-27077 --- .../context/annotation/ConfigurationClassParser.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index 88a1c4d45d..c666f2c689 100644 --- 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 scannedBeanDefinitions =