Skip to content

S
spring-boot
Commit 44534421 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Remove use of deprecated API in TomcatServletWebServerFactory

parent e007f207
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
View file @ 44534421
......@@ -252,7 +252,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
// Otherwise the default location of a Spring DispatcherServlet cannot be set
defaultServlet.setOverridable(true);
context.addChild(defaultServlet);
addServletMapping(context, "/", "default");
context.addServletMappingDecoded("/", "default");
}
private void addJspServlet(Context context) {
......@@ -266,13 +266,8 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
}
jspServlet.setLoadOnStartup(3);
context.addChild(jspServlet);
addServletMapping(context, "*.jsp", "jsp");
addServletMapping(context, "*.jspx", "jsp");
}
@SuppressWarnings("deprecation")
private void addServletMapping(Context context, String pattern, String name) {
context.addServletMapping(pattern, name);
context.addServletMappingDecoded("*.jsp", "jsp");
context.addServletMappingDecoded("*.jspx", "jsp");
}
private void addJasperInitializer(TomcatEmbeddedContext context) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment