From 93ff80a1d3bb668ecc2412523c0431528994df2b Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 16 Nov 2012 07:25:21 +0100
Subject: [PATCH] Prevent NPE in TemplateController if logged user is null

FEA: ItEr77S04BugFixing
---
 .../java/org/libreplan/web/common/TemplateController.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
index f81e7c814..c3ea12442 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
@@ -35,6 +35,7 @@ import org.libreplan.web.common.ITemplateModel.IOnFinished;
 import org.libreplan.web.common.components.bandboxsearch.BandboxSearch;
 import org.libreplan.web.security.SecurityUtils;
 import org.libreplan.web.users.bootstrap.PredefinedUsers;
+import org.libreplan.web.users.services.CustomUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
@@ -227,7 +228,11 @@ public class TemplateController extends GenericForwardComposer {
     }
 
     public String getUsername() {
-        return SecurityUtils.getLoggedUser().getUsername();
+        CustomUser user = SecurityUtils.getLoggedUser();
+        if (user == null) {
+            return "";
+        }
+        return user.getUsername();
     }
 
 }