Merge branch '2.7.x'

pull/29572/head
Brian Clozel 3 years ago
commit 03da915f56

@ -231,7 +231,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