From 03d9ebb879033458ef64d44c61c250c54b545b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 5 May 2011 19:07:27 +0200
Subject: [PATCH] [Bug #1049] Fix bug

Milestones don't have calendars and the calendar of the task was
always reattached.

FEA: ItEr74S04BugFixing
---
 .../org/navalplanner/web/planner/order/EditTaskUtilities.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/EditTaskUtilities.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/EditTaskUtilities.java
index 02012dceb..9b11e354f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/EditTaskUtilities.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/EditTaskUtilities.java
@@ -83,6 +83,9 @@ public class EditTaskUtilities implements IEditTaskUtilities {
 
     private void reattachAndLoadCalendar(TaskElement taskElement) {
         BaseCalendar calendar = taskElement.getCalendar();
+        if (calendar == null) {
+            return;
+        }
         baseCalendarDAO.reattach(calendar);
         forceLoadCalendar(calendar);
         calendar.getCapacityOn(