You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2014/08/12 23:39:43 UTC
[2/3] git commit: RAVE-1273 | Orphaned page members shouldn't cause
an NPE
RAVE-1273 | Orphaned page members shouldn't cause an NPE
Project: http://git-wip-us.apache.org/repos/asf/rave/repo
Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/a79d859b
Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/a79d859b
Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/a79d859b
Branch: refs/heads/master
Commit: a79d859bd559f956fa638d8045d9af85ed6285e3
Parents: 126f1fe
Author: Stanton Sievers <ss...@w2odigital.com>
Authored: Mon Aug 11 11:34:15 2014 -0400
Committer: Stanton Sievers <ss...@w2odigital.com>
Committed: Mon Aug 11 11:34:15 2014 -0400
----------------------------------------------------------------------
.../portal/security/impl/DefaultPagePermissionEvaluator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/rave/blob/a79d859b/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
----------------------------------------------------------------------
diff --git a/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java b/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
index e5c75db..81cf436 100644
--- a/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
+++ b/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
@@ -224,7 +224,8 @@ public class DefaultPagePermissionEvaluator extends AbstractModelPermissionEvalu
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 @@ public class DefaultPagePermissionEvaluator extends AbstractModelPermissionEvalu
return false;
}
-}
\ No newline at end of file
+}