Merge branch '1.2.x'

da450411 · Andy Wilkinson · 69b60f6d · 43ed824f · da450411
Commit da450411 authored Jan 18, 2016 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

TomcatEmbeddedServletContainerFactory.java ...mbedded/tomcat/TomcatEmbeddedServletContainerFactory.java +1 -0

No files found.
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
@@ -182,6 +182,7 @@ public class TomcatEmbeddedServletContainerFactory
 						: ClassUtils.getDefaultClassLoader());
 		try {
 			context.setUseRelativeRedirects(false);
+			context.setMapperContextRootRedirectEnabled(true);
 		}
 		catch (NoSuchMethodError ex) {
 			// Tomcat is < 8.0.30. Continue