From d17eb8c0fc05f8706ca52ccc5d22d204b01cd4ae Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 10 Aug 2011 18:30:39 +0200
Subject: [PATCH] Fix NullPointerException in highlightDaysOnCalendar method

FEA: ItEr75S04BugFixing
---
 .../web/calendars/BaseCalendarCRUDController.java             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
index b64618946..80c581cef 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
@@ -120,7 +120,9 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
     }
 
     private void highlightDaysOnCalendar() {
-        editionController.highlightDaysOnCalendar();
+        if (editionController != null) {
+            editionController.highlightDaysOnCalendar();
+        }
     }
 
     public void save() {