From 90ddbe4c5059b5c6aa52743f8a44543ad2c67fca Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 20 Jan 2010 21:08:31 +0100
Subject: [PATCH] ItEr44S11CUImportarTraballoRealizadoPorSubcontrataItEr43S14:
 Fixed lazy exception loading resource calendars and its ancestors.

---
 .../web/planner/allocation/ResourceAllocationModel.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
index 2a2fc1e0c..98bc54ad9 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
@@ -352,7 +352,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
         resourceDAO.reattach(resource);
         reattachCriterionSatisfactions(resource.getCriterionSatisfactions());
         if (resource.getCalendar() != null) {
-            calendarDAO.reattachUnmodifiedEntity(resource.getCalendar());
             loadCalendar(resource.getCalendar());
         }
         for (DayAssignment dayAssignment : resource.getAssignments()) {
@@ -364,6 +363,7 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
     }
 
     private void loadCalendar(BaseCalendar baseCalendar) {
+        calendarDAO.reattachUnmodifiedEntity(baseCalendar);
         for (CalendarData calendarData : baseCalendar.getCalendarDataVersions()) {
             calendarData.getHoursPerDay().size();
             if (calendarData.getParent() != null) {