Skip to content

Commit c31ad5f

Browse files
committed
Merge branch '2.7.x'
Closes gh-31802
2 parents 94b224b + 6469a02 commit c31ad5f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected Collection<String> loadFactoryNames(Class<?> source) {
105105
@Override
106106
protected Set<String> getExclusions(AnnotationMetadata metadata, AnnotationAttributes attributes) {
107107
Set<String> exclusions = new LinkedHashSet<>();
108-
Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), null);
108+
Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), getBeanClassLoader());
109109
for (String annotationName : ANNOTATION_NAMES) {
110110
AnnotationAttributes merged = AnnotatedElementUtils.getMergedAnnotationAttributes(source, annotationName);
111111
Class<?>[] exclude = (merged != null) ? merged.getClassArray("exclude") : null;
@@ -129,7 +129,7 @@ protected Set<String> getExclusions(AnnotationMetadata metadata, AnnotationAttri
129129

130130
protected final Map<Class<?>, List<Annotation>> getAnnotations(AnnotationMetadata metadata) {
131131
MultiValueMap<Class<?>, Annotation> annotations = new LinkedMultiValueMap<>();
132-
Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), null);
132+
Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), getBeanClassLoader());
133133
collectAnnotations(source, annotations, new HashSet<>());
134134
return Collections.unmodifiableMap(annotations);
135135
}

0 commit comments

Comments
 (0)