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

Merge branch '2.6.x' into 2.7.x 

Closes gh-29557
This commit is contained in:
Brian Clozel 2022-01-25 09:22:19 +01:00
parent 698eb94913 1204c1aa32
commit 24c5f4b7ea
1 changed files with 1 additions and 1 deletions
Show Stats 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) { protected final void configureWebAppContext(WebAppContext context, ServletContextInitializer... initializers) {
Assert.notNull(context, "Context must not be null"); Assert.notNull(context, "Context must not be null");
context.getAliasChecks().clear(); context.clearAliasChecks();
context.setTempDirectory(getTempDirectory()); context.setTempDirectory(getTempDirectory());
if (this.resourceLoader != null) { if (this.resourceLoader != null) {
context.setClassLoader(this.resourceLoader.getClassLoader()); context.setClassLoader(this.resourceLoader.getClassLoader());