RAVE-1273 | Orphaned page members shouldn't cause an NPE

apache · Aug 11, 2014 · a79d859 · a79d859
1 parent 126f1fe
commit a79d859
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...re/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java b/...re/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
@@ -224,7 +224,8 @@ private boolean isPageMember(Authentication authentication, Page page, List<Page
         List<PageUser> members = trustedPage.getMembers();
         if (members != null) {
             for (PageUser pageUser : members){
-                if (userRepository.get(pageUser.getUserId()).getUsername().equals(viewer)){
+                User user = userRepository.get(pageUser.getUserId());
+                if (user != null && user.getUsername().equals(viewer)){
                     log.info("User "+viewer+" is a member of page "+trustedPage.getId());
                     if(checkEditorStatus){
                         log.info("checking editor:"+trustedPage.getId()+"@"+viewer+"@"+pageUser.isEditor());
@@ -238,4 +239,4 @@ private boolean isPageMember(Authentication authentication, Page page, List<Page
         return false;
     }
 
-}
+}