Skip to content

Commit 2d1f758

Browse files
author
Dave Syer
committed
Autoconfigure MVC if HandlerMapping already defined
1 parent e695b4a commit 2d1f758

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.springframework.web.filter.HiddenHttpMethodFilter;
4545
import org.springframework.web.servlet.DispatcherServlet;
4646
import org.springframework.web.servlet.HandlerAdapter;
47-
import org.springframework.web.servlet.HandlerMapping;
4847
import org.springframework.web.servlet.View;
4948
import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
5049
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -64,7 +63,7 @@
6463
@Configuration
6564
@ConditionalOnClass({ Servlet.class, DispatcherServlet.class,
6665
WebMvcConfigurerAdapter.class })
67-
@ConditionalOnMissingBean({ HandlerAdapter.class, HandlerMapping.class })
66+
@ConditionalOnMissingBean({ HandlerAdapter.class })
6867
@Order(Ordered.HIGHEST_PRECEDENCE + 10)
6968
@AutoConfigureAfter(EmbeddedServletContainerAutoConfiguration.class)
7069
public class WebMvcAutoConfiguration {

0 commit comments

Comments
 (0)