Skip to content

Commit a772242

Browse files
committed
Merge pull request #48129 from linw-bai
* pr/48129: Use beanClassLoader when checking excluded auto-configuration classes Closes gh-48129
2 parents 2f1f964 + 8bcab02 commit a772242

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

spring-boot-project/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
@@ -205,8 +205,9 @@ protected List<String> getCandidateConfigurations(AnnotationMetadata metadata, A
205205

206206
private void checkExcludedClasses(List<String> configurations, Set<String> exclusions) {
207207
List<String> invalidExcludes = new ArrayList<>(exclusions.size());
208+
ClassLoader classLoader = (this.beanClassLoader != null) ? this.beanClassLoader : getClass().getClassLoader();
208209
for (String exclusion : exclusions) {
209-
if (ClassUtils.isPresent(exclusion, getClass().getClassLoader()) && !configurations.contains(exclusion)) {
210+
if (ClassUtils.isPresent(exclusion, classLoader) && !configurations.contains(exclusion)) {
210211
invalidExcludes.add(exclusion);
211212
}
212213
}

0 commit comments

Comments
 (0)