Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5.x' into 2.6.x

Browse Source 
Closes gh-29556
This commit is contained in:
Brian Clozel
2022-01-25 09:21:49 +01:00
parent 909ef6d635 f1bbce1aac
commit 1204c1aa32
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java
View File

@@ -232,7 +232,7 @@ public class JettyServletWebServerFactory extends AbstractServletWebServerFactor
*/
protected final void configureWebAppContext(WebAppContext context, ServletContextInitializer... initializers) {
Assert.notNull(context, "Context must not be null");
context.getAliasChecks().clear();
context.clearAliasChecks();
context.setTempDirectory(getTempDirectory());
if (this.resourceLoader != null) {
context.setClassLoader(this.resourceLoader.getClassLoader());