svn commit: r17212 - /dev/struts/2.5.7/
Author: lukaszlenart Date: Fri Dec 2 08:16:33 2016 New Revision: 17212 Log: Updates test release 2.5.7 Added: dev/struts/2.5.7/ dev/struts/2.5.7/struts-2.5.7-all.zip (with props) dev/struts/2.5.7/struts-2.5.7-all.zip.asc (with props) dev/struts/2.5.7/struts-2.5.7-all.zip.md5 dev/struts/2.5.7/struts-2.5.7-all.zip.sha1 dev/struts/2.5.7/struts-2.5.7-apps.zip (with props) dev/struts/2.5.7/struts-2.5.7-apps.zip.asc (with props) dev/struts/2.5.7/struts-2.5.7-apps.zip.md5 dev/struts/2.5.7/struts-2.5.7-apps.zip.sha1 dev/struts/2.5.7/struts-2.5.7-docs.zip (with props) dev/struts/2.5.7/struts-2.5.7-docs.zip.asc (with props) dev/struts/2.5.7/struts-2.5.7-docs.zip.md5 dev/struts/2.5.7/struts-2.5.7-docs.zip.sha1 dev/struts/2.5.7/struts-2.5.7-lib.zip (with props) dev/struts/2.5.7/struts-2.5.7-lib.zip.asc (with props) dev/struts/2.5.7/struts-2.5.7-lib.zip.md5 dev/struts/2.5.7/struts-2.5.7-lib.zip.sha1 dev/struts/2.5.7/struts-2.5.7-min-lib.zip (with props) dev/struts/2.5.7/struts-2.5.7-min-lib.zip.asc (with props) dev/struts/2.5.7/struts-2.5.7-min-lib.zip.md5 dev/struts/2.5.7/struts-2.5.7-min-lib.zip.sha1 dev/struts/2.5.7/struts-2.5.7-src.zip (with props) dev/struts/2.5.7/struts-2.5.7-src.zip.asc (with props) dev/struts/2.5.7/struts-2.5.7-src.zip.md5 dev/struts/2.5.7/struts-2.5.7-src.zip.sha1 Added: dev/struts/2.5.7/struts-2.5.7-all.zip == Binary file - no diff available. Propchange: dev/struts/2.5.7/struts-2.5.7-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.7/struts-2.5.7-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.7/struts-2.5.7-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.7/struts-2.5.7-all.zip.md5 == --- dev/struts/2.5.7/struts-2.5.7-all.zip.md5 (added) +++ dev/struts/2.5.7/struts-2.5.7-all.zip.md5 Fri Dec 2 08:16:33 2016 @@ -0,0 +1 @@ +ae0393357bbe56685bfa6b03cc84e40c \ No newline at end of file Added: dev/struts/2.5.7/struts-2.5.7-all.zip.sha1 == --- dev/struts/2.5.7/struts-2.5.7-all.zip.sha1 (added) +++ dev/struts/2.5.7/struts-2.5.7-all.zip.sha1 Fri Dec 2 08:16:33 2016 @@ -0,0 +1 @@ +9fb380aea629f7ea6c95c9cdd2a590b7847d174c \ No newline at end of file Added: dev/struts/2.5.7/struts-2.5.7-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.5.7/struts-2.5.7-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.7/struts-2.5.7-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.7/struts-2.5.7-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.7/struts-2.5.7-apps.zip.md5 == --- dev/struts/2.5.7/struts-2.5.7-apps.zip.md5 (added) +++ dev/struts/2.5.7/struts-2.5.7-apps.zip.md5 Fri Dec 2 08:16:33 2016 @@ -0,0 +1 @@ +e6598a8c665a4fb2aef3695de0d07af5 \ No newline at end of file Added: dev/struts/2.5.7/struts-2.5.7-apps.zip.sha1 == --- dev/struts/2.5.7/struts-2.5.7-apps.zip.sha1 (added) +++ dev/struts/2.5.7/struts-2.5.7-apps.zip.sha1 Fri Dec 2 08:16:33 2016 @@ -0,0 +1 @@ +bf0c6bfa0e029f278ab9031b9c394670411928f1 \ No newline at end of file Added: dev/struts/2.5.7/struts-2.5.7-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.5.7/struts-2.5.7-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.7/struts-2.5.7-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.7/struts-2.5.7-docs.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.7/struts-2.5.7-docs.zip.md5 == --- dev/struts/2.5.7/struts-2.5.7-docs.zip.md5 (added) +++ dev/struts/2.5.7/struts-2.5.7-d
struts git commit: WW-4722 Checks proper scope for stored locale
Repository: struts
Updated Branches:
refs/heads/master 484ce1d19 -> baffa9a68
WW-4722 Checks proper scope for stored locale
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/baffa9a6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/baffa9a6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/baffa9a6
Branch: refs/heads/master
Commit: baffa9a68b2ff02cab3387ab0b53794a1e541c7e
Parents: 484ce1d
Author: Lukasz Lenart
Authored: Fri Dec 2 19:30:36 2016 +0100
Committer: Lukasz Lenart
Committed: Fri Dec 2 19:30:36 2016 +0100
--
.../struts2/interceptor/I18nInterceptor.java| 21
1 file changed, 13 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/baffa9a6/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 16ce51f..4d3bdf0 100644
--- 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 @@ public class I18nInterceptor extends AbstractInterceptor {
* @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");
