Merge branch '2.6.x' into 2.7.x

Closes gh-31801
spring-projects · Jul 20, 2022 · 6469a02 · 6469a02
2 parents 255631f + 043354f
commit 6469a02
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...in/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java b/...in/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java
@@ -105,7 +105,7 @@ protected Collection<String> loadFactoryNames(Class<?> source) {
 	@Override
 	protected Set<String> getExclusions(AnnotationMetadata metadata, AnnotationAttributes attributes) {
 		Set<String> exclusions = new LinkedHashSet<>();
-		Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), null);
+		Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), getBeanClassLoader());
 		for (String annotationName : ANNOTATION_NAMES) {
 			AnnotationAttributes merged = AnnotatedElementUtils.getMergedAnnotationAttributes(source, annotationName);
 			Class<?>[] exclude = (merged != null) ? merged.getClassArray("exclude") : null;
@@ -129,7 +129,7 @@ protected Set<String> getExclusions(AnnotationMetadata metadata, AnnotationAttri
 
 	protected final Map<Class<?>, List<Annotation>> getAnnotations(AnnotationMetadata metadata) {
 		MultiValueMap<Class<?>, Annotation> annotations = new LinkedMultiValueMap<>();
-		Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), null);
+		Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), getBeanClassLoader());
 		collectAnnotations(source, annotations, new HashSet<>());
 		return Collections.unmodifiableMap(annotations);
 	}