Skip to content

Commit 1204c1a

Browse files
committed
Merge branch '2.5.x' into 2.6.x
Closes gh-29556
2 parents 909ef6d + f1bbce1 commit 1204c1a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ private void customizeSsl(Server server, InetSocketAddress address) {
232232
*/
233233
protected final void configureWebAppContext(WebAppContext context, ServletContextInitializer... initializers) {
234234
Assert.notNull(context, "Context must not be null");
235-
context.getAliasChecks().clear();
235+
context.clearAliasChecks();
236236
context.setTempDirectory(getTempDirectory());
237237
if (this.resourceLoader != null) {
238238
context.setClassLoader(this.resourceLoader.getClassLoader());

0 commit comments

Comments
 (0)