From 129f3db74b98e48cce570e8196a99f85c9b14859 Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Wed, 2 Jun 2010 19:38:32 +0200 Subject: [PATCH] ItEr59S08CUAsignacionRecursosLimitantesItEr58S10: Fix bug infinite loop on inserting a queue element directly at a specific time --- .../web/limitingresources/LimitingResourceQueueModel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 77ad00fcc..09c02e3b5 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 @@ -798,6 +798,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel { if (gap != null) { final LocalDate startDate = gap.getStartTime().getDate(); + if (startDate.equals(allocationTime.getDate())) { assignLimitingResourceQueueElementToQueueAt(element, queue, allocationTime); break; @@ -832,7 +833,8 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel { // Rest of elements for (int i = 0; i < elements.size(); i++) { final LimitingResourceQueueElement each = elements.get(i); - if (isInTheMiddle(each, allocationTime)) { + if (isInTheMiddle(each, allocationTime) || + isAfter(each, allocationTime)) { return each; } }