Skip to content

Commit a273627

Browse files
committed
Revert merge mistake: restore urlMappings assignment
Signed-off-by: Daeho Kwon <[email protected]>
1 parent 7ac49cb commit a273627

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,7 @@ private void configureFromAnnotation(ServletRegistrationBean<Servlet> bean, Serv
319319
bean.setAsyncSupported(registration.asyncSupported());
320320
bean.setIgnoreRegistrationFailure(registration.ignoreRegistrationFailure());
321321
bean.setLoadOnStartup(registration.loadOnStartup());
322-
if (registration.urlMappings().length > 0) {
323-
bean.setUrlMappings(Arrays.asList(registration.urlMappings()));
324-
}
322+
bean.setUrlMappings(Arrays.asList(registration.urlMappings()));
325323
}
326324

327325
}

0 commit comments

Comments
 (0)