From 8682a5d89ada327067dd65e4652d94eee56f83f1 Mon Sep 17 00:00:00 2001
From: Lars Grefer <lars.grefer@materna.de>
Date: Mon, 6 Apr 2020 16:10:41 +0200
Subject: [PATCH] Honor overriden
 AccepptHeaderLocaleContextResolver.getDefaultLocale()

---
 .../web/server/i18n/AcceptHeaderLocaleContextResolver.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java b/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java
index 6b0f88f650b..a5147eca118 100644
--- a/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java
@@ -98,7 +98,7 @@ public class AcceptHeaderLocaleContextResolver implements LocaleContextResolver
 	@Nullable
 	private Locale resolveSupportedLocale(@Nullable List<Locale> requestLocales) {
 		if (CollectionUtils.isEmpty(requestLocales)) {
-			return this.defaultLocale;  // may be null
+			return getDefaultLocale();  // may be null
 		}
 		List<Locale> supportedLocales = getSupportedLocales();
 		if (supportedLocales.isEmpty()) {
@@ -128,7 +128,8 @@ public class AcceptHeaderLocaleContextResolver implements LocaleContextResolver
 			return languageMatch;
 		}
 
-		return (this.defaultLocale != null ? this.defaultLocale : requestLocales.get(0));
+		final Locale defaultLocale = getDefaultLocale();
+		return (defaultLocale != null ? defaultLocale : requestLocales.get(0));
 	}
 
 	@Override