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 requestLocales) { if (CollectionUtils.isEmpty(requestLocales)) { - return this.defaultLocale; // may be null + return getDefaultLocale(); // may be null } List 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