From 12eea11c00cc3cd27327b91638b8b4ca4cd1e015 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 28 Apr 2015 09:41:15 +0000 Subject: [PATCH] Centralise Subject in CmsSession git-svn-id: https://svn.argeo.org/commons/trunk@8083 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java | 1 - org.argeo.cms/src/org/argeo/cms/util/UserMenu.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java index 1e04bc050..7b32b00f8 100644 --- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java +++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java @@ -49,7 +49,6 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements this.workspace = workspace; // Initial login - Subject subject = new Subject(); try { new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_USER, subject) .login(); diff --git a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java index 45fd4b3ad..10964c717 100644 --- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java +++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java @@ -130,7 +130,7 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { protected void login() { CmsSession cmsSession = (CmsSession) getDisplay().getData( CmsSession.KEY); - Subject subject = new Subject(); + Subject subject = cmsSession.getSubject(); try { // // LOGIN @@ -151,7 +151,7 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { protected void logout() { final CmsSession cmsSession = (CmsSession) getDisplay().getData( CmsSession.KEY); - Subject subject = new Subject(); + Subject subject = cmsSession.getSubject(); try { // // LOGOUT -- 2.30.2