Fix for #3167 - IllegalStateExcepton when session expires

svn changeset:8578/svn branch:6.1

1 files changed, 10 insertions, 5 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index a9e30bdb67..0e1566ad0e 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -913,17 +913,22 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
                 // just go ahead redirect the browser
                 response.sendRedirect(ci.getSessionExpiredURL());
             } else {
-                // send uidl redirect
-                criticalNotification(request, response, ci
-                        .getSessionExpiredCaption(), ci
-                        .getSessionExpiredMessage(), null, 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.
+                 * 
+                 * Session must be invalidated before criticalNotification as it
+                 * commits the response.
                  */
                 request.getSession().invalidate();
+
+                // send uidl redirect
+                criticalNotification(request, response, ci
+                        .getSessionExpiredCaption(), ci
+                        .getSessionExpiredMessage(), null, ci
+                        .getSessionExpiredURL());
+
             }
         } catch (SystemMessageException ee) {
             throw new ServletException(ee);