From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 20 Mar 2018 10:36:47 +0000 (+0100)
Subject: Make CMS Login more robust
X-Git-Tag: argeo-commons-2.1.73~32
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=49fc76ba74a908417cb954274593cce384babeaa;p=lgpl%2Fargeo-commons.git

Make CMS Login more robust
---

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;