Skip to content

Commit e81651b

Browse files
committed
Ignore empty Accept-Language header value
Issue: SPR-15603
1 parent b494c53 commit e81651b

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

spring-web/src/main/java/org/springframework/http/HttpHeaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ public void setAcceptLanguage(List<Locale.LanguageRange> languages) {
467467
*/
468468
public List<Locale.LanguageRange> getAcceptLanguage() {
469469
String value = getFirst(ACCEPT_LANGUAGE);
470-
return value != null ? Locale.LanguageRange.parse(value) : Collections.emptyList();
470+
return StringUtils.hasText(value) ? Locale.LanguageRange.parse(value) : Collections.emptyList();
471471
}
472472

473473
/**

spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,12 @@ public void acceptLanguage() {
447447
assertEquals(Locale.FRANCE, headers.getAcceptLanguageAsLocales().get(0));
448448
}
449449

450+
@Test // SPR-15603
451+
public void acceptLanguageWithEmptyValue() throws Exception {
452+
this.headers.set(HttpHeaders.ACCEPT_LANGUAGE, "");
453+
assertEquals(Collections.emptyList(), this.headers.getAcceptLanguageAsLocales());
454+
}
455+
450456
@Test
451457
public void contentLanguage() {
452458
headers.setContentLanguage(Locale.FRANCE);

0 commit comments

Comments
 (0)