dgraham 2003/02/24 20:39:32
Modified: src/share/org/apache/struts/util RequestUtils.java
Log:
Fix my fix for PR #17312.
Revision Changes Path
1.88 +6 -7
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- RequestUtils.java 25 Feb 2003 03:27:40 -0000 1.87
+++ RequestUtils.java 25 Feb 2003 04:39:31 -0000 1.88
@@ -874,8 +874,7 @@
*/
public static Locale retrieveUserLocale(PageContext pageContext, String locale)
{
Locale userLocale = null;
- HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
- HttpSession session = request.getSession(false);
+ HttpSession session = pageContext.getSession();
if (locale == null) {
locale = Globals.LOCALE_KEY;
@@ -883,7 +882,7 @@
// Only check session if sessions are enabled
if (session != null) {
- userLocale = (Locale) pageContext.getAttribute(locale,
PageContext.SESSION_SCOPE);
+ userLocale = (Locale) session.getAttribute(locale);
}
if (userLocale == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
