From 9d58dd475e25162651c4bb98788597fb771fee96 Mon Sep 17 00:00:00 2001 From: Mauro Mugnaini Date: Fri, 29 May 2020 15:47:51 +0200 Subject: [PATCH] Fixed NPE when user not belongs to any context --- .../oidc/lr62/UserSitesToGroupsAndRolesMapper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nubisware/oidc/lr62/UserSitesToGroupsAndRolesMapper.java b/src/main/java/com/nubisware/oidc/lr62/UserSitesToGroupsAndRolesMapper.java index c723f7b..0baaeee 100644 --- a/src/main/java/com/nubisware/oidc/lr62/UserSitesToGroupsAndRolesMapper.java +++ b/src/main/java/com/nubisware/oidc/lr62/UserSitesToGroupsAndRolesMapper.java @@ -86,8 +86,8 @@ public class UserSitesToGroupsAndRolesMapper { Site gwSitesTree = null; try { gwSitesTree = mapper.map(rootVOGCubeGroup.getGroupName()); - if (log.isInfoEnabled()) { - log.info("Sites tree is: " + gwSitesTree.dump()); + if (log.isDebugEnabled()) { + log.debug("Sites tree is: " + (gwSitesTree != null ? gwSitesTree.dump() : "null")); } } catch (SitesMapperExecption e) { log.error("Computing sites tree in concrete mapper class", e); @@ -101,7 +101,7 @@ public class UserSitesToGroupsAndRolesMapper { if (log.isDebugEnabled()) { log.debug("Check user to sites removal"); } - checkForVRERemoval(gwSitesTree); + checkForSiteRemoval(gwSitesTree); } @@ -205,7 +205,7 @@ public class UserSitesToGroupsAndRolesMapper { } } - protected void checkForVRERemoval(Site gwSitesTree) { + protected void checkForSiteRemoval(Site gwSitesTree) { List vreNames = new ArrayList<>(); if (gwSitesTree != null) { log.debug("Collecting VREs user belongs to");