From 49fc76ba74a908417cb954274593cce384babeaa Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 20 Mar 2018 11:36:47 +0100 Subject: [PATCH] Make CMS Login more robust --- .../src/org/argeo/cms/widgets/auth/CmsLogin.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java index e450bfa07..db0ae6296 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java @@ -254,7 +254,11 @@ public class CmsLogin implements CmsStyles, CallbackHandler { // LOGIN // // loginContext.logout(); - LoginContext loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, subject, this); + LoginContext loginContext; + if (subject == null) + loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, this); + else + loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, subject, this); loginContext.login(); cmsView.authChange(loginContext); return true; -- 2.30.2