From d08480320bc541028706d07c0a565af241cede5d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 29 Jun 2016 20:14:17 -0700 Subject: [PATCH] Stop RequestContextFilter initializing config Change WebMvcAutoConfigurationAdapter.requestContextFilter() to a static method so that the configuration class isn't needed when creating it. This helps to prevent early initialization of beans. See gh-6178 --- .../autoconfigure/web/WebMvcAutoConfiguration.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java index 69c1f4c4f94..f6516f31f35 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java @@ -195,13 +195,6 @@ public class WebMvcAutoConfiguration { return resolver; } - @Bean - @ConditionalOnMissingBean({ RequestContextListener.class, - RequestContextFilter.class }) - public RequestContextFilter requestContextFilter() { - return new OrderedRequestContextFilter(); - } - @Bean @ConditionalOnBean(View.class) @ConditionalOnMissingBean @@ -312,6 +305,13 @@ public class WebMvcAutoConfiguration { } } + @Bean + @ConditionalOnMissingBean({ RequestContextListener.class, + RequestContextFilter.class }) + public static RequestContextFilter requestContextFilter() { + return new OrderedRequestContextFilter(); + } + @Configuration @ConditionalOnProperty(value = "spring.mvc.favicon.enabled", matchIfMissing = true) public static class FaviconConfiguration {