From 065db8c6434f075055e3703fd535755924acc3b4 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 7 Apr 2015 08:59:03 +0200
Subject: [PATCH] OO-1508: check all parameters of the user session against
null
---
src/main/java/org/olat/admin/landingpages/model/Rule.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/admin/landingpages/model/Rule.java b/src/main/java/org/olat/admin/landingpages/model/Rule.java
index 63330fc3f86..7a048936c93 100644
--- a/src/main/java/org/olat/admin/landingpages/model/Rule.java
+++ b/src/main/java/org/olat/admin/landingpages/model/Rule.java
@@ -77,7 +77,9 @@ public class Rule {
}
public boolean match(UserSession userSession) {
- if(userSession == null || userSession.getRoles() == null) return false;
+ if(userSession == null || userSession.getRoles() == null || userSession.getIdentity() == null) {
+ return false;
+ }
boolean match = true;
@@ -88,7 +90,7 @@ public class Rule {
case AUTHOR: match &= roles.isAuthor(); break;
case USER_MGR: match &= roles.isUserManager(); break;
case GROUP_MGR: match &= roles.isGroupManager(); break;
- case RSRC_MGR: match &= roles.isInstitutionalResourceManager(); break;
+ case RSRC_MGR: match &= roles.isInstitutionalResourceManager(); break;
case POOL_MGR: match &= roles.isPoolAdmin(); break;
case ADMIN: match &= roles.isOLATAdmin(); break;
default: {
--
GitLab