root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Madhura Bhave 2018-06-27 11:34:22 -07:00
parent 598b1f4300 5fd30a9dc2
commit cde3c21926
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
View File

@ -378,7 +378,7 @@ public class TomcatServletWebServerFactoryTests
} }
@Test @Test
public void defaultLocaleCharsetMappingsAreOverriden() { public void defaultLocaleCharsetMappingsAreOverridden() {
TomcatServletWebServerFactory factory = getFactory(); TomcatServletWebServerFactory factory = getFactory();
this.webServer = factory.getWebServer(); this.webServer = factory.getWebServer();
// override defaults, see org.apache.catalina.util.CharsetMapperDefault.properties // override defaults, see org.apache.catalina.util.CharsetMapperDefault.properties