Merge branch '2.5.x'

wilkinsona · wilkinsona · commit 91579158c319 · 2021-07-21T10:58:27.000+01:00
Closes gh-27425
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurer.java
@@ -162,7 +162,7 @@ private <T> List<T> getDetectors(ConfigurableListableBeanFactory beanFactory, Cl
 			List<String> names = SpringFactoriesLoader.loadFactoryNames(type, beanFactory.getBeanClassLoader());
 			Instantiator<T> instantiator = new Instantiator<>(type,
 					(availableParameters) -> availableParameters.add(Environment.class, this.environment));
-			return instantiator.instantiate(names);
+			return instantiator.instantiate(beanFactory.getBeanClassLoader(), names);
 		}
 
 		private static BeanDefinition getBeanDefinition(String beanName, ConfigurableListableBeanFactory beanFactory) {

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ private <T> List<T> getDetectors(ConfigurableListableBeanFactory beanFactory, Cl`
`162`	`162`	`List<String> names = SpringFactoriesLoader.loadFactoryNames(type, beanFactory.getBeanClassLoader());`
`163`	`163`	`Instantiator<T> instantiator = new Instantiator<>(type,`
`164`	`164`	`(availableParameters) -> availableParameters.add(Environment.class, this.environment));`
`165`		`- return instantiator.instantiate(names);`
	`165`	`+ return instantiator.instantiate(beanFactory.getBeanClassLoader(), names);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`private static BeanDefinition getBeanDefinition(String beanName, ConfigurableListableBeanFactory beanFactory) {`