root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Remove use of deprecated API in TomcatServletWebServerFactory

Browse Source
pull/9151/merge
Andy Wilkinson 8 years ago
parent e007f20725
commit 445344211d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File

11
spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
Unescape Escape View File

@ -252,7 +252,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
// Otherwise the default location of a Spring DispatcherServlet cannot be set // Otherwise the default location of a Spring DispatcherServlet cannot be set
defaultServlet.setOverridable(true); defaultServlet.setOverridable(true);
context.addChild(defaultServlet); context.addChild(defaultServlet);
addServletMapping(context, "/", "default"); context.addServletMappingDecoded("/", "default");
} }
private void addJspServlet(Context context) { private void addJspServlet(Context context) {
@ -266,13 +266,8 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
} }
jspServlet.setLoadOnStartup(3); jspServlet.setLoadOnStartup(3);
context.addChild(jspServlet); context.addChild(jspServlet);
addServletMapping(context, "*.jsp", "jsp"); context.addServletMappingDecoded("*.jsp", "jsp");
addServletMapping(context, "*.jspx", "jsp"); context.addServletMappingDecoded("*.jspx", "jsp");
}
@SuppressWarnings("deprecation")
private void addServletMapping(Context context, String pattern, String name) {
context.addServletMapping(pattern, name);
} }
private void addJasperInitializer(TomcatEmbeddedContext context) { private void addJasperInitializer(TomcatEmbeddedContext context) {

Write Preview
Loading…
Cancel
Save