From b87ea09c0f3c11fad6550424ac7c1271eb5b2f93 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 20 Oct 2011 13:55:21 +0200
Subject: [PATCH] [Bug #1214] Fix issue changing Hibernate mapping for map
 inside CalendarData

Now capacityPerDay map is not lazy and it's loaded with the
CalendarData. This fixes the problem when the load chart was printed.

FEA: ItEr75S04BugFixing
---
 .../navalplanner/business/calendars/entities/Calendars.hbm.xml  | 2 +-
 .../java/org/navalplanner/web/calendars/BaseCalendarModel.java  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml
index 346d99d09..f999f4cf3 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml
@@ -119,7 +119,7 @@
 
         <property name="code" access="property" not-null="true" unique="true"/>
 
-        <map name="capacityPerDay" table="capacity_per_day">
+        <map name="capacityPerDay" table="capacity_per_day" lazy="false">
             <key column="base_calendar_id"/>
             <index column="day_id" type="integer" />
             <composite-element class="org.navalplanner.business.calendars.entities.Capacity">
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
index 9f4e3b05b..a7f2fd332 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
@@ -188,7 +188,6 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
 
     public static void forceLoadBaseCalendar(BaseCalendar baseCalendar) {
         for (CalendarData calendarData : baseCalendar.getCalendarDataVersions()) {
-            calendarData.getHoursPerDay().size();
             if (calendarData.getParent() != null) {
                 forceLoadBaseCalendar(calendarData.getParent());
             }