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

AcceptHeaderLocaleContextResolver leniently handles invalid header value

Browse Source 
Also falls back to language-only match among its supported locales now.

Issue: SPR-16500
Issue: SPR-16457
This commit is contained in:
Juergen Hoeller
2018-02-15 13:14:49 +01:00
parent 067ad4c57a
commit cd8a1bdb8b
6 changed files with 142 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
View File

@@ -55,11 +55,9 @@ public class AcceptHeaderLocaleResolver implements LocaleResolver {
* @param locales the supported locales
* @since 4.3
*/
public void setSupportedLocales(@Nullable List<Locale> locales) {
public void setSupportedLocales(List<Locale> locales) {
this.supportedLocales.clear();
if (locales != null) {
this.supportedLocales.addAll(locales);
}
this.supportedLocales.addAll(locales);
}
/**