Merge branch '2.3.x' into 2.4.x

wilkinsona · wilkinsona · commit 11fa850b9773 · 2021-04-26T15:53:18.000+01:00
Closes gh-26236
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java
@@ -94,7 +94,7 @@ private Collection<String> getConfigurationsForAnnotation(Class<?> source, Annot
 	}
 
 	protected Collection<String> loadFactoryNames(Class<?> source) {
-		return SpringFactoriesLoader.loadFactoryNames(source, getClass().getClassLoader());
+		return SpringFactoriesLoader.loadFactoryNames(source, getBeanClassLoader());
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private Collection<String> getConfigurationsForAnnotation(Class<?> source, Annot`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`protected Collection<String> loadFactoryNames(Class<?> source) {`
`97`		`- return SpringFactoriesLoader.loadFactoryNames(source, getClass().getClassLoader());`
	`97`	`+ return SpringFactoriesLoader.loadFactoryNames(source, getBeanClassLoader());`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`