From da1a680032c91627720e2cd020b728317d6f848b Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 17 Nov 2009 17:16:07 +0100
Subject: [PATCH]  ItEr35S08CUAsignacionCalendarioLaboralRecursoItEr25S09:
 Fixed bug when the basic Configuration entity does not exist.

---
 .../org/navalplanner/web/common/ConfigurationModel.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
index 621e2c67c..d30229f64 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
@@ -80,7 +80,13 @@ public class ConfigurationModel implements IConfigurationModel {
     }
 
     private void forceLoad(Configuration configuration) {
-        configuration.getDefaultCalendar().getName();
+        forceLoad(configuration.getDefaultCalendar());
+    }
+
+    private void forceLoad(BaseCalendar calendar) {
+        if (calendar != null) {
+            calendar.getName();
+        }
     }
 
     @Override