Skip to content

Commit f241cd0

Browse files
committed
Merge pull request #23554 from dreis2211
* pr/23554: Improve performance of DispatcherServletRegistrationCondition Closes gh-23554
2 parents 2ab2cf0 + efbbd8b commit f241cd0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,13 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM
168168
}
169169

170170
private ConditionOutcome checkDefaultDispatcherName(ConfigurableListableBeanFactory beanFactory) {
171+
boolean containsDispatcherBean = beanFactory.containsBean(DEFAULT_DISPATCHER_SERVLET_BEAN_NAME);
172+
if (!containsDispatcherBean) {
173+
return ConditionOutcome.match();
174+
}
171175
List<String> servlets = Arrays
172176
.asList(beanFactory.getBeanNamesForType(DispatcherServlet.class, false, false));
173-
boolean containsDispatcherBean = beanFactory.containsBean(DEFAULT_DISPATCHER_SERVLET_BEAN_NAME);
174-
if (containsDispatcherBean && !servlets.contains(DEFAULT_DISPATCHER_SERVLET_BEAN_NAME)) {
177+
if (!servlets.contains(DEFAULT_DISPATCHER_SERVLET_BEAN_NAME)) {
175178
return ConditionOutcome.noMatch(
176179
startMessage().found("non dispatcher servlet").items(DEFAULT_DISPATCHER_SERVLET_BEAN_NAME));
177180
}

0 commit comments

Comments
 (0)