RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr59S08CUAsignacionRecursosLimitantesItEr58S10: Fix bug infinite loop on inserting a queue element directly at a specific time

Browse source
This commit is contained in:
Diego Pino Garcia 2010-06-02 19:38:32 +02:00 • committed by Javier Moran Rua
parent 6e7fa6ee0d
commit 129f3db74b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
View file

@ -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;
}
}