[sling-org-apache-sling-auth-saml2] branch master updated: check for null to fix sonarcloud

[cris]

This is an automated email from the ASF dual-hosted git repository.

cris pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-auth-saml2.git


The following commit(s) were added to refs/heads/master by this push:
     new 0d16e37  check for null to fix sonarcloud
0d16e37 is described below

commit 0d16e37bde1591f5296f8ebe5c1569eb103dbc94
Author: Cris Rockwell <cmroc...@umich.edu>
AuthorDate: Tue Jun 29 13:23:16 2021 -0400

    check for null to fix sonarcloud
---
 .../org/apache/sling/auth/saml2/impl/Saml2UserMgtServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/auth/saml2/impl/Saml2UserMgtServiceImpl.java 
b/src/main/java/org/apache/sling/auth/saml2/impl/Saml2UserMgtServiceImpl.java
index cc27ac7..0a7ca75 100644
--- 
a/src/main/java/org/apache/sling/auth/saml2/impl/Saml2UserMgtServiceImpl.java
+++ 
b/src/main/java/org/apache/sling/auth/saml2/impl/Saml2UserMgtServiceImpl.java
@@ -36,6 +36,8 @@ import java.security.Principal;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
+
 
 @Component(service={Saml2UserMgtService.class}, immediate = true)
 public class Saml2UserMgtServiceImpl implements Saml2UserMgtService {
@@ -59,6 +61,10 @@ public class Saml2UserMgtServiceImpl implements 
Saml2UserMgtService {
             logger.info(this.resourceResolver.getUserID());
             session = this.resourceResolver.adaptTo(Session.class);
             JackrabbitSession jrSession = (JackrabbitSession) session;
+            if (Objects.isNull(jrSession)){
+                logger.error("Could not setup Saml2UserMgtService. 
JackrabbitSession was null.");
+                return false;
+            }
             userManager = jrSession.getUserManager();
             vf = this.session.getValueFactory();
             return true;
@@ -67,8 +73,6 @@ public class Saml2UserMgtServiceImpl implements 
Saml2UserMgtService {
                     "Check mapping org.apache.sling.auth.saml2:{}={}", 
SERVICE_NAME, SERVICE_USER, e);
         } catch (RepositoryException e) {
             logger.error("RepositoryException", e);
-        } catch (Exception e){
-            logger.error("Could not setup Saml2UserMgtService", e);
         }
         return false;
     }