From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 7 Feb 2018 11:16:07 +0000 (+0100)
Subject: Make retrieval of secret keys more robust
X-Git-Tag: argeo-commons-2.1.71~9
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=33c65b3c6eb26e65c04e8176ae73ffeb43d40c23;p=lgpl%2Fargeo-commons.git

Make retrieval of secret keys more robust
---

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
index aa313ee0a..e6c63a4de 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
@@ -145,7 +145,8 @@ class CmsAuthUtils {
 								+ " for existing CMS session " + cmsSession);
 					}
 					// keyring
-					subject.getPrivateCredentials().addAll(cmsSession.getSecretKeys());
+					if (cmsSession != null)
+						subject.getPrivateCredentials().addAll(cmsSession.getSecretKeys());
 				} else {// anonymous
 					if (cmsSession.getAuthorization().getName() != null) {
 						cmsSession.close();