X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fhandlers%2FCloseWorkbench.java;h=cce18020db355d64681b710f5a526a6b1df9d1f1;hb=3b45f571938e0eb6803084aac3f2bd298e6026ba;hp=c2ae4bff7c8b32cb7562c4a28607216276205182;hpb=d2bca81ff63496bf1d879f4cbcd6a531f598e69c;p=lgpl%2Fargeo-commons.git

diff --git a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java
index c2ae4bff7..cce18020d 100644
--- a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java
+++ b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java
@@ -1,11 +1,9 @@
 package org.argeo.cms.e4.handlers;
 
-import java.security.AccessController;
-
 import javax.security.auth.Subject;
 
-import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.swt.CmsException;
+import org.argeo.cms.CurrentUser;
+import org.argeo.cms.util.CurrentSubject;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.workbench.IWorkbench;
 
@@ -17,11 +15,11 @@ public class CloseWorkbench {
 	}
 
 	protected void logout() {
-		Subject subject = Subject.getSubject(AccessController.getContext());
+		Subject subject = CurrentSubject.current();
 		try {
 			CurrentUser.logoutCmsSession(subject);
 		} catch (Exception e) {
-			throw new CmsException("Cannot log out", e);
+			throw new IllegalStateException("Cannot log out", e);
 		}
 	}