Merge branch '2.5.x'

Closes gh-27425
This commit is contained in:
Andy Wilkinson 2021-07-21 10:58:27 +01:00
commit 91579158c3

View File

@ -162,7 +162,7 @@ public class DatabaseInitializationDependencyConfigurer implements ImportBeanDef
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) {