From 2809763f1aa1225f82ad789752b327262d4ea75c Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Mon, 27 Dec 2010 13:44:06 +0100 Subject: [PATCH] Fix bug when allocating an unscheduled queue element, do it like if it were like an unscheduled element in the list on unscheduled queue elements If doing an appropriative allocation it's necessary to unscheduled element to make room enough for a gap, later those elements should be schedule back again like it were unscheduled elements coming from the list of unscheduled queue elements. It's not possile to make any guess about in which queue it make fit, as this may change depending on the new gaps created. FEA: ItEr66OTS08CorreccionsRecursosLimitantesItEr65OTS04 --- .../web/limitingresources/LimitingResourceQueueModel.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java index 25e56b7d2..81588fe5b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java @@ -1005,9 +1005,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel { } while (gap != null); for (LimitingResourceQueueElement each: unscheduledElements) { - gap = LimitingResourceAllocator.getFirstValidGap(queue, each); - result.addAll(assignLimitingResourceQueueElementToQueueAt(each, queue, gap - .getStartTime(), getEndsAfterBecauseOfGantt(element))); + assignLimitingResourceQueueElement(each); } return result;