From 2d1f758fd86112bab1bd98d1c562be06d16503fe Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Thu, 25 Jul 2013 10:09:11 +0100
Subject: [PATCH] Autoconfigure MVC if HandlerMapping already defined

---
 .../autoconfigure/web/WebMvcAutoConfiguration.java             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java
index 2af6456dd31..4a389c9d786 100644
--- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java
+++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java
@@ -44,7 +44,6 @@ import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.HandlerAdapter;
-import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -64,7 +63,7 @@ import org.springframework.web.servlet.view.ContentNegotiatingViewResolver;
 @Configuration
 @ConditionalOnClass({ Servlet.class, DispatcherServlet.class,
 		WebMvcConfigurerAdapter.class })
-@ConditionalOnMissingBean({ HandlerAdapter.class, HandlerMapping.class })
+@ConditionalOnMissingBean({ HandlerAdapter.class })
 @Order(Ordered.HIGHEST_PRECEDENCE + 10)
 @AutoConfigureAfter(EmbeddedServletContainerAutoConfiguration.class)
 public class WebMvcAutoConfiguration {