Merge branch '7.0.x'

Author: bclozel

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

@@ -85,7 +85,7 @@ public List<Locale> getSupportedLocales() {
 	@Override
 	public Locale resolveLocale(HttpServletRequest request) {
 		Locale defaultLocale = getDefaultLocale();
-		if (defaultLocale != null && request.getHeader("Accept-Language") == null) {
+		if (defaultLocale != null && !StringUtils.hasText(request.getHeader("Accept-Language"))) {
 			return defaultLocale;
 		}
 		Locale requestLocale = request.getLocale();

spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java

@@ -105,6 +105,14 @@ void defaultLocale() {
 		assertThat(this.resolver.resolveLocale(request)).isEqualTo(US);
 	}
 
+	@Test
+	void defaultLocaleWithBlankAcceptLanguageHeader() {
+		this.resolver.setDefaultLocale(JAPANESE);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("Accept-Language", "");
+		assertThat(this.resolver.resolveLocale(request)).isEqualTo(JAPANESE);
+	}
+
 
 	private HttpServletRequest request(Locale... locales) {
 		MockHttpServletRequest request = new MockHttpServletRequest();