Index: portal-charon/charon/src/webapp/scripts/portalscripts.js =================================================================== --- portal-charon/charon/src/webapp/scripts/portalscripts.js (revision 76852) +++ portal-charon/charon/src/webapp/scripts/portalscripts.js (working copy) @@ -115,7 +115,7 @@ success: function(data){ //get the maxInactiveInterval in the same ms data.maxInactiveInterval = data.maxInactiveInterval * 1000; - if(data.active && data.lastAccessedTime + data.maxInactiveInterval + if(data.active && data.userId != null && data.lastAccessedTime + data.maxInactiveInterval > data.currentTime) { //User is logged in, so now determine how much time is left var remaining = data.lastAccessedTime + data.maxInactiveInterval - data.currentTime; @@ -132,6 +132,9 @@ sessionTimeOut = setTimeout("poll_session_data()", (remaining - timeoutDialogWarningTime*1000)); } + } else if (data.userId == null) { + // if data.userId is null, the session is done; redirect the user to logoutUrl + location.href=timeoutLoggedoutUrl; } else { //the timeout length has occurred, but there is a slight delay, do this until you get a 404 sessionTimeOut = setTimeout("poll_session_data()", 1000 * 10);