SAK-32746 - Sometimes the anonymous return from SAK-32738 is null (sa…

…kaiproject#4668)
mmg-3 · Aug 3, 2017 · 34ef01e · 34ef01e
1 parent 6f3f4f3
commit 34ef01e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
@@ -1051,7 +1051,7 @@ public PortalRenderContext startPageContext(String siteType, String title,
 
 
 		User currentUser = UserDirectoryService.getCurrentUser();
-		Role role = site.getUserRole(currentUser.getId());
+		Role role = site != null && currentUser != null ? site.getUserRole(currentUser.getId()) : null;
 
 		rcontext.put("loggedIn", Boolean.valueOf(currentUser.getId() != null));
 		rcontext.put("userId", currentUser.getId());