weaver 2005/01/04 08:15:14 Modified: portal/src/java/org/apache/jetspeed/engine/servlet ServletRequestImpl.java Log: Consolidated session/request keys Revision Changes Path 1.31 +7 -5 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java Index: ServletRequestImpl.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- ServletRequestImpl.java 17 Oct 2004 16:18:20 -0000 1.30 +++ ServletRequestImpl.java 4 Jan 2005 16:15:14 -0000 1.31 @@ -30,6 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.jetspeed.PortalReservedParameters; import org.apache.jetspeed.container.url.PortalURL; import org.apache.jetspeed.request.JetspeedRequestContext; import org.apache.jetspeed.request.RequestContext; @@ -170,7 +171,7 @@ Object value = super.getAttribute(name); if (name.equals(PortletRequest.USER_INFO)) { - JetspeedRequestContext context = (JetspeedRequestContext) getAttribute(RequestContext.REQUEST_PORTALENV); + JetspeedRequestContext context = (JetspeedRequestContext) getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); if (null != context) { String entityID = "--NULL--"; @@ -218,7 +219,7 @@ public Locale getLocale() { //Locale preferedLocale = (Locale) getSession().getAttribute(RequestContext.PREFERED_LOCALE_SESSION_KEY); - RequestContext requestContext = (RequestContext) _getHttpServletRequest().getAttribute(RequestContext.REQUEST_PORTALENV); + RequestContext requestContext = (RequestContext) _getHttpServletRequest().getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); Locale preferedLocale = requestContext.getLocale(); if (preferedLocale != null) { @@ -233,7 +234,7 @@ */ public Enumeration getLocales() { - RequestContext requestContext = (RequestContext) _getHttpServletRequest().getAttribute(RequestContext.REQUEST_PORTALENV); + RequestContext requestContext = (RequestContext) _getHttpServletRequest().getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); Locale preferedLocale = requestContext.getLocale(); if (preferedLocale != null) { @@ -322,8 +323,9 @@ } else { + String encodedKey = nameSpaceMapper.encode(portletWindow.getId(), name); this._getHttpServletRequest().setAttribute( - nameSpaceMapper.encode(portletWindow.getId(), name), value); + encodedKey, value); } } super.setAttribute(name, value);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]