Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove use of deprecated API in TomcatServletWebServerFactory

Browse Source
This commit is contained in:
Andy Wilkinson
2017-05-12 16:44:22 +01:00
parent e007f20725
commit 445344211d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {