Make retrieval of secret keys more robust

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / CmsAuthUtils.java

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 aa313ee0a954e6b2b1fa088f9c1881d9e093de72..e6c63a4de030edfed46be5a206b05643dd0e588d 100644 (file)
--- 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();