Skip to content

Commit 3bda78a

Browse files
committed
Fix tests after HandlerExceptionResolver logging changes
See gh-14936 and gh-15189
1 parent 97f7984 commit 3bda78a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
import org.springframework.web.servlet.i18n.FixedLocaleResolver;
8686
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
8787
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
88+
import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
8889
import org.springframework.web.servlet.resource.AppCacheManifestTransformer;
8990
import org.springframework.web.servlet.resource.CachingResourceResolver;
9091
import org.springframework.web.servlet.resource.CachingResourceTransformer;
@@ -573,7 +574,8 @@ private ContextConsumer<AssertableWebApplicationContext> assertExceptionResolver
573574
List<HandlerExceptionResolver> delegates = ((HandlerExceptionResolverComposite) resolver)
574575
.getExceptionResolvers();
575576
for (HandlerExceptionResolver delegate : delegates) {
576-
if (delegate instanceof AbstractHandlerExceptionResolver) {
577+
if (delegate instanceof AbstractHandlerExceptionResolver
578+
&& !(delegate instanceof DefaultHandlerExceptionResolver)) {
577579
consumer.accept(ReflectionTestUtils.getField(delegate, "warnLogger"));
578580
}
579581
}

0 commit comments

Comments
 (0)