WW-4722 Checks proper scope for stored locale

dut3062796s · Dec 2, 2016 · baffa9a · baffa9a
1 parent 484ce1d
commit baffa9a
Showing 1 changed file with 13 additions and 8 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
@@ -235,16 +235,21 @@ protected void storeLocaleInSession(ActionInvocation invocation, Locale locale)
      * @return the read locale
      */
     protected Locale readStoredLocale(ActionInvocation invocation) {
-        Locale locale = readStoredLocalFromSession(invocation);
-        if (locale != null) {
-            LOG.debug("Found stored Locale {} in session, using it!", locale);
-            return locale;
+        Locale locale;
+        if (storage == Storage.COOKIE) {
+            locale = readStoredLocalFromSession(invocation);
+            if (locale != null) {
+                LOG.debug("Found stored Locale {} in session, using it!", locale);
+                return locale;
+            }
         }
 
-        Locale cookie = readStoredLocaleFromCookie(invocation);
-        if (cookie != null) {
-            LOG.debug("Found stored Locale {} in cookies, using it!", locale);
-            return cookie;
+        if (storage == Storage.SESSION) {
+            locale = readStoredLocaleFromCookie(invocation);
+            if (locale != null) {
+                LOG.debug("Found stored Locale {} in cookies, using it!", locale);
+                return locale;
+            }
         }
 
         LOG.debug("Neither locale was in session nor in cookies, searching current Invocation context");