Skip to content

Commit 097184c

Browse files
committed
Merge branch '3.5.x'
Closes gh-48132
2 parents 78b79a7 + a772242 commit 097184c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,9 @@ protected List<String> getCandidateConfigurations(AnnotationMetadata metadata,
211211

212212
private void checkExcludedClasses(List<String> configurations, Set<String> exclusions) {
213213
List<String> invalidExcludes = new ArrayList<>(exclusions.size());
214+
ClassLoader classLoader = (this.beanClassLoader != null) ? this.beanClassLoader : getClass().getClassLoader();
214215
for (String exclusion : exclusions) {
215-
if (ClassUtils.isPresent(exclusion, getClass().getClassLoader()) && !configurations.contains(exclusion)) {
216+
if (ClassUtils.isPresent(exclusion, classLoader) && !configurations.contains(exclusion)) {
216217
invalidExcludes.add(exclusion);
217218
}
218219
}

0 commit comments

Comments
 (0)