From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 7 Feb 2021 16:42:05 +0000 (+0100)
Subject: Make logout more robust.
X-Git-Tag: argeo-commons-2.1.101~1^2
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=3577df2ca5eee54db1ac39a7bd5ed7bdc8824a67

Make logout more robust.
---

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
index fa552323c..eaaf41ab7 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -150,7 +150,11 @@ public final class CurrentUser {
 		else
 			return false;
 		CmsSessionImpl cmsSession = CmsSessionImpl.getByUuid(nodeSessionId.toString());
-		cmsSession.close();
+		
+		// FIXME logout all views
+		// TODO check why it is sometimes null
+		if (cmsSession != null)
+			cmsSession.close();
 		// if (log.isDebugEnabled())
 		// log.debug("Logged out CMS session " + cmsSession.getUuid());
 		return true;