Merge application and entry point factory

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / UserMenu.java

diff --git a/org.argeo.cms/src/org/argeo/cms/UserMenu.java b/org.argeo.cms/src/org/argeo/cms/UserMenu.java
index da48237fa61499b7366bb85e239f75ef94593f4d..41ff9ab7f1276bf20c32e9ffc37014073395d783 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/UserMenu.java
+++ b/org.argeo.cms/src/org/argeo/cms/UserMenu.java
@@ -1,5 +1,9 @@
 package org.argeo.cms;
 
+import static org.argeo.cms.internal.kernel.KernelConstants.SPRING_SECURITY_CONTEXT_KEY;
+
+import javax.servlet.http.HttpSession;
+
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
@@ -81,6 +85,8 @@ public class UserMenu extends Shell implements CmsStyles {
 
                        public void mouseDown(MouseEvent e) {
                                SecurityContextHolder.getContext().setAuthentication(null);
+                               HttpSession httpSession = RWT.getRequest().getSession();
+                               httpSession.removeAttribute(SPRING_SECURITY_CONTEXT_KEY);
                                close();
                                dispose();
                                cmsSession.authChange();