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.3.x' into 3.4.x

This commit is contained in:
Phillip Webb 2025-04-09 14:51:31 -07:00
parent e29dc450a6 4af0ee20d1
commit bcda6aeb65
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2024 the original author or authors. * Copyright 2012-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -463,7 +463,7 @@ public class SpringApplication {
} }
private <T> List<T> getSpringFactoriesInstances(Class<T> type, ArgumentResolver argumentResolver) { 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() { private ConfigurableEnvironment getOrCreateEnvironment() {
@ -713,10 +713,11 @@ public class SpringApplication {
* @return a ClassLoader (never null) * @return a ClassLoader (never null)
*/ */
public ClassLoader getClassLoader() { public ClassLoader getClassLoader() {
if (this.resourceLoader != null) { return getClassLoader(ClassUtils.getDefaultClassLoader());
return this.resourceLoader.getClassLoader(); }
}
return ClassUtils.getDefaultClassLoader(); private ClassLoader getClassLoader(ClassLoader fallback) {
return (this.resourceLoader != null) ? this.resourceLoader.getClassLoader() : fallback;
} }
/** /**