Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Decouples LocaleProvider instance from long living interceptor state

Browse Source
This commit is contained in:
Lukasz Lenart
2017-03-16 08:15:04 +01:00
parent 82983713ae
commit 4eb22020a4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
+4 -2
View File
@@ -59,7 +59,7 @@ public class I18nInterceptor extends AbstractInterceptor {
protected String requestCookieParameterName = DEFAULT_COOKIE_PARAMETER;
protected Storage storage = Storage.SESSION;
protected LocaleProvider localeProvider;
protected LocaleProviderFactory localeProviderFactory;
// Request-Only = None
protected enum Storage { COOKIE, SESSION, NONE }
@@ -95,7 +95,7 @@ public class I18nInterceptor extends AbstractInterceptor {
@Inject
public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
this.localeProvider = localeProviderFactory.createLocaleProvider();
this.localeProviderFactory = localeProviderFactory;
}
@Override
@@ -157,6 +157,8 @@ public class I18nInterceptor extends AbstractInterceptor {
* @return the Locale
*/
protected Locale getLocaleFromParam(Object requestedLocale) {
LocaleProvider localeProvider = localeProviderFactory.createLocaleProvider();
Locale locale = null;
if (requestedLocale != null) {
if (requestedLocale instanceof Locale) {