Merge branch '2.5.x' into 2.6.x

Closes gh-30541
spring-projects · Apr 5, 2022 · 53b2c85 · 53b2c85
2 parents bf3c2d7 + 18c62e2
commit 53b2c85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/...main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
@@ -267,6 +267,7 @@ protected void prepareContext(Host host, ServletContextInitializer[] initializer
 	private void resetDefaultLocaleMapping(TomcatEmbeddedContext context) {
 		context.addLocaleEncodingMappingParameter(Locale.ENGLISH.toString(), DEFAULT_CHARSET.displayName());
 		context.addLocaleEncodingMappingParameter(Locale.FRENCH.toString(), DEFAULT_CHARSET.displayName());
+		context.addLocaleEncodingMappingParameter(Locale.JAPANESE.toString(), DEFAULT_CHARSET.displayName());
 	}
 
 	private void addLocaleMappings(TomcatEmbeddedContext context) {

diff --git a/...java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java b/...java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
@@ -411,6 +411,7 @@ void defaultLocaleCharsetMappingsAreOverridden() {
 		// override defaults, see org.apache.catalina.util.CharsetMapperDefault.properties
 		assertThat(getCharset(Locale.ENGLISH)).isEqualTo(StandardCharsets.UTF_8);
 		assertThat(getCharset(Locale.FRENCH)).isEqualTo(StandardCharsets.UTF_8);
+		assertThat(getCharset(Locale.JAPANESE)).isEqualTo(StandardCharsets.UTF_8);
 	}
 
 	@Test