From ea09a8828bc48287b3966f727726b433ca9a2685 Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Mon, 7 Jan 2019 17:29:46 +0200 Subject: [PATCH] WW-4998 I18nInterceptor's default storage should store locale --- .../org/apache/struts2/interceptor/I18nInterceptor.java | 9 ++++----- .../apache/struts2/interceptor/I18nInterceptorTest.java | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) 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 682bbe6d7..4ddcedfce 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java @@ -261,6 +261,7 @@ public class I18nInterceptor extends AbstractInterceptor { super(invocation); } + @Override public Locale find() { Locale requestOnlyLocale = super.find(); @@ -281,15 +282,13 @@ public class I18nInterceptor extends AbstractInterceptor { @Override public Locale store(ActionInvocation invocation, Locale locale) { - HttpSession session = ServletActionContext.getRequest().getSession(false); + Map session = invocation.getInvocationContext().getSession(); if (session != null) { - String sessionId = session.getId(); + String sessionId = ServletActionContext.getRequest().getSession().getId(); synchronized (sessionId.intern()) { - invocation.getInvocationContext().getSession().put(attributeName, locale); + session.put(attributeName, locale); } - } else { - LOG.debug("session creation avoided as it doesn't exist already"); } return locale; 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 fcc0dd11b..da5607fef 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java @@ -79,8 +79,8 @@ public class I18nInterceptorTest extends TestCase { assertFalse("should have been removed", mai.getInvocationContext().getParameters().get(I18nInterceptor.DEFAULT_PARAMETER).isDefined()); - assertNull("should not be created", request.getSession(false)); - assertNull("should not be stored here", session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE)); + assertNotNull("should be created", request.getSession(false)); + assertNotNull("should be stored here", session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE)); } public void testDefaultLocale() throws Exception {