Merge branch '2.6.x' into 2.7.x

Closes gh-29557
pull/22885/merge
Brian Clozel 3 years ago
commit 24c5f4b7ea

@ -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());

Loading…
Cancel
Save