From 2a2b8a3331ceaf45f05b1e277f8d678e7ae3b358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 20 Dec 2010 22:40:37 +0100
Subject: [PATCH] [Bug #766] Fix bug

The problem lied in that the task's start date changed due to the task
being moved but the resource allocation keep on using its own date
instead of the new value. This leads to using a stale value for doing
the allocation. This can cause that the used start date was posterior
that the new end date as it happened in the exception.

FEA: ItEr66S04BugFixing
---
 .../planner/entities/ResourceAllocation.java      | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
index 45229dd26..f1a59a168 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
@@ -590,7 +590,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
 
         @Override
         public IAllocateResourcesPerDay resourcesPerDayUntil(final LocalDate endExclusive) {
-            IntraDayDate startInclusive = getStartAfterConsolidated();
+            IntraDayDate startInclusive = getStartSpecifiedByTask();
             IntraDayDate end = IntraDayDate.startOfDay(endExclusive);
             return new AllocateResourcesPerDayOnInterval(startInclusive, end);
         }
@@ -598,9 +598,8 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
         @Override
         public IAllocateResourcesPerDay resourcesPerDayFromEndUntil(
                 LocalDate start) {
-            IntraDayDate startInclusive = IntraDayDate
-                    .max(IntraDayDate.startOfDay(start),
-                            getStartAfterConsolidated());
+            IntraDayDate startInclusive = IntraDayDate.max(
+                    IntraDayDate.startOfDay(start), getStartSpecifiedByTask());
             IntraDayDate endDate = task.getIntraDayEndDate();
             return new AllocateResourcesPerDayOnInterval(startInclusive,
                     endDate);
@@ -668,7 +667,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
 
                 @Override
                 public void allocateHours(int hours) {
-                    allocate(getStartAfterConsolidated(),
+                    allocate(getStartSpecifiedByTask(),
                             IntraDayDate.startOfDay(end), hours(hours));
                 }
             };
@@ -688,7 +687,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
 
         private void allocate(IntraDayDate startInclusive,
                 IntraDayDate endExclusive, EffortDuration durationToAssign) {
-            IntraDayDate afterConsolidated = getStartAfterConsolidated();
+            IntraDayDate afterConsolidated = getStartSpecifiedByTask();
             List<T> assignmentsCreated = createAssignments(
                     IntraDayDate.max(afterConsolidated, startInclusive),
                     endExclusive, durationToAssign);
@@ -1426,8 +1425,8 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
         return start != null ? start.getDate() : null;
     }
 
-    public IntraDayDate getStartAfterConsolidated() {
-        IntraDayDate taskStart = getIntraDayStartDate();
+    private IntraDayDate getStartSpecifiedByTask() {
+        IntraDayDate taskStart = task.getIntraDayStartDate();
         IntraDayDate firstDayNotConsolidated = getTask()
                 .getFirstDayNotConsolidated();
         return IntraDayDate.max(taskStart, firstDayNotConsolidated);