dgraham 2003/07/25 17:30:43 Modified: src/share/org/apache/struts/action Action.java Log: getLocale() now calls RequestUtils.getUserLocale() to prevent session creation. PR# 21250. Revision Changes Path 1.65 +14 -22 jakarta-struts/src/share/org/apache/struts/action/Action.java Index: Action.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- Action.java 4 Jul 2003 21:27:24 -0000 1.64 +++ Action.java 26 Jul 2003 00:30:43 -0000 1.65 @@ -125,6 +125,8 @@ /** * The system default Locale. + * @deprecated Use Locale.getDefault() directly. This will be removed after + * Struts 1.2. */ protected static Locale defaultLocale = Locale.getDefault(); @@ -293,14 +295,7 @@ * @param request The request we are processing */ protected Locale getLocale(HttpServletRequest request) { - - HttpSession session = request.getSession(); - Locale locale = (Locale) session.getAttribute(Globals.LOCALE_KEY); - if (locale == null) { - locale = defaultLocale; - } - return (locale); - + return RequestUtils.getUserLocale(request, null); } /** @@ -395,10 +390,7 @@ * @param request The servlet request we are processing * @param reset Should we reset the token after checking it? */ - protected boolean isTokenValid( - HttpServletRequest request, - boolean reset) { - + protected boolean isTokenValid(HttpServletRequest request, boolean reset) { return token.isTokenValid(request, reset); } @@ -424,8 +416,7 @@ * @param request The servlet request we are processing * @param errors Error messages object */ - protected void saveErrors(HttpServletRequest request, - ActionErrors errors) { + protected void saveErrors(HttpServletRequest request, ActionErrors errors) { // Remove any error messages attribute if none are required if ((errors == null) || errors.isEmpty()) { @@ -449,8 +440,9 @@ * @param messages Messages object * @since Struts 1.1 */ - protected void saveMessages(HttpServletRequest request, - ActionMessages messages) { + protected void saveMessages( + HttpServletRequest request, + ActionMessages messages) { // Remove any messages attribute if none are required if ((messages == null) || messages.isEmpty()) { @@ -476,7 +468,7 @@ /** - * Set the user's currently selected Locale. + * Set the user's currently selected Locale into their HttpSession. * * @param request The request we are processing * @param locale The user's selected Locale to be set, or null @@ -486,7 +478,7 @@ HttpSession session = request.getSession(); if (locale == null) { - locale = defaultLocale; + locale = Locale.getDefault(); } session.setAttribute(Globals.LOCALE_KEY, locale);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]