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=91070f22286617a673ef525735e96943548b5e24;hb=54df376a9c2dd458a82eaa09bfbb718fe699dd0d;hp=c2ae4bff7c8b32cb7562c4a28607216276205182;hpb=7b242851c0094d13cbaca5b68261ad92c873a59f;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..91070f222 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.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); } }