Repository: struts Updated Branches: refs/heads/master b3a9c9d23 -> 6916f47c9
WW-4677 Ignores locale set to null Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6916f47c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6916f47c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6916f47c Branch: refs/heads/master Commit: 6916f47c97ae06c7d0a1dedba38cefcd6566ee36 Parents: b3a9c9d Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Tue Sep 20 17:04:38 2016 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Tue Sep 20 17:04:38 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/struts2/interceptor/I18nInterceptor.java | 2 +- .../java/org/apache/struts2/interceptor/I18nInterceptorTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/6916f47c/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java index 7467a95..cec69af 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java @@ -247,7 +247,7 @@ public class I18nInterceptor extends AbstractInterceptor { } } - if (!localeProvider.isValidLocale(locale)) { + if (locale != null && !localeProvider.isValidLocale(locale)) { Locale defaultLocale = localeProvider.getLocale(); LOG.debug("Provided locale {} isn't valid, fallback to default locale", locale, defaultLocale); locale = defaultLocale; http://git-wip-us.apache.org/repos/asf/struts/blob/6916f47c/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java index 68cbfee..2744eb1 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java @@ -182,7 +182,8 @@ public class I18nInterceptorTest extends TestCase { interceptor.intercept(mai); Locale locale = (Locale) session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE); - assertNotNull(locale); + assertNull(locale); // should not be stored here + locale = mai.getInvocationContext().getLocale(); assertEquals(locale1, locale); }
