From 40e97fdc3ab918e205b32682aa170dde76a5c91c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Tue, 8 May 2012 12:29:05 +0200 Subject: [PATCH] Bug #1284: Fix NullPointerException. FEA: ItEr76S04BugFixing --- .../main/java/org/libreplan/web/common/TemplateModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java index 09bf5de3a..9f7f7765e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java @@ -482,7 +482,11 @@ public class TemplateModel implements ITemplateModel { @Override @Transactional(readOnly = true) public boolean isUserAdmin() { - return UserUtil.getUserFromSession().isAdministrator(); + User user = UserUtil.getUserFromSession(); + if(user == null) { + return false; + } + return user.isAdministrator(); } @Override