root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

This commit is contained in:
Phillip Webb 2025-04-09 14:51:36 -07:00
parent 70e11de647 bcda6aeb65
commit 2147c2650c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@ -463,7 +463,7 @@ public class SpringApplication {
}
private <T> List<T> getSpringFactoriesInstances(Class<T> type, ArgumentResolver argumentResolver) {
return SpringFactoriesLoader.forDefaultResourceLocation(getClassLoader()).load(type, argumentResolver);
return SpringFactoriesLoader.forDefaultResourceLocation(getClassLoader(null)).load(type, argumentResolver);
}
private ConfigurableEnvironment getOrCreateEnvironment() {
@ -713,10 +713,11 @@ public class SpringApplication {
* @return a ClassLoader (never null)
*/
public ClassLoader getClassLoader() {
if (this.resourceLoader != null) {
return this.resourceLoader.getClassLoader();
}
return ClassUtils.getDefaultClassLoader();
return getClassLoader(ClassUtils.getDefaultClassLoader());
}
private ClassLoader getClassLoader(ClassLoader fallback) {
return (this.resourceLoader != null) ? this.resourceLoader.getClassLoader() : fallback;
}
/**