Invalidates session after saying 'session expired'. Fixes #1979

svn changeset:5396/svn branch:trunk

1 files changed, 4 insertions, 0 deletions

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index ead0e18129..939977b8db 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -520,6 +520,10 @@ public class ApplicationServlet extends HttpServlet {
                             .getSessionExpiredCaption(), ci
                             .getSessionExpiredMessage(), ci
                             .getSessionExpiredURL());
+                    // Invalidate session (weird to have session if we're saying
+                    // that it's expired, and worse: portal integration will
+                    // fail since the session is not created by the portal.
+                    request.getSession().invalidate();
                 }
             } catch (SystemMessageException ee) {
                 throw new ServletException(ee);