You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2012/05/14 21:28:50 UTC
svn commit: r1338354 - in
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main:
java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java
resources/static/windowhandler.html
Author: struberg
Date: Mon May 14 19:28:50 2012
New Revision: 1338354
URL: http://svn.apache.org/viewvc?rev=1338354&view=rev
Log:
EXTCDI-290 delete cookies after request
This now works in all browsers but Firefox
which has a corresponding bug open since 2007.
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/static/windowhandler.html
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java?rev=1338354&r1=1338353&r2=1338354&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java Mon May 14 19:28:50 2012
@@ -47,7 +47,7 @@ public class ClientSideWindowHandler ext
{
private static final long serialVersionUID = 5293942986187078113L;
- private static final String WINDOW_ID_COOKIE_SUFFIX = "-codiWindowId";
+ private static final String WINDOW_ID_COOKIE_PREFIX = "codiWindowId-";
private static final String CODI_REQUEST_TOKEN = "mfRid";
private static final String UNINITIALIZED_WINDOW_ID_VALUE = "uninitializedWindowId";
@@ -242,11 +242,16 @@ public class ClientSideWindowHandler ext
private String getWindowIdFromCookie(ExternalContext externalContext)
{
- String cookieName = getRequestToken(externalContext) + WINDOW_ID_COOKIE_SUFFIX;
+ String cookieName = WINDOW_ID_COOKIE_PREFIX + getRequestToken(externalContext);
Cookie cookie = (Cookie) externalContext.getRequestCookieMap().get(cookieName);
if (cookie != null)
{
+ // manually blast the cookie away, otherwise it pollutes the
+ // cookie storage in some browsers. E.g. Firefox doesn't
+ // cleanup properly, even if the max-age is reached.
+ cookie.setMaxAge(0);
+
return cookie.getValue();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/static/windowhandler.html
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/static/windowhandler.html?rev=1338354&r1=1338353&r2=1338354&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/static/windowhandler.html (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/static/windowhandler.html Mon May 14 19:28:50 2012
@@ -148,20 +148,19 @@ window.onload = function() {
window.name = windowId;
- /* used to debug the intermediate page
- if (!confirm('reload?')) { return true; }
- */
+ // uncomment the following line to debug the intermediate page
+ // if (!confirm('reload?')) { return true; }
// 2 seconds expiry time
var expdt = new Date();
expdt.setTime(expdt.getTime()+(2*1000));
var expires = "; expires="+expdt.toGMTString();
- var requestToken = Math.floor(Math.random()*10001);
+ var requestToken = Math.floor(Math.random()*1001);
var newUrl = setUrlParam(window.location.href, "mfRid", requestToken);
newUrl = setUrlParam(newUrl, "windowId", windowId);
- document.cookie = requestToken + '-codiWindowId=' + windowId + expires;
+ document.cookie = 'codiWindowId-' + requestToken + '=' + windowId + expires;
window.location = newUrl;
}