[Bug #903] Limiting resource allocation window does not respect activation periods for the resources

* Return Queues that satisfy Criteria at any interval of time

FEA : ItEr71S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-02-25 17:43:03 +01:00
parent 69770b3955
commit faa68a5256

View file

@ -294,12 +294,10 @@ public class QueuesState {
ResourceEnum resourceType = generic.getResourceType();
Set<Criterion> criteria = generic.getCriterions();
final ICriterion compositedCriterion = CriterionCompounder.buildAnd(
criteria).getResult();
for (LimitingResourceQueue each : queues) {
Resource resource = each.getResource();
if (resource.getType().equals(resourceType)
&& compositedCriterion.isSatisfiedBy(resource)) {
&& resource.satisfiesCriterionsAtSomePoint(criteria)) {
result.add(each);
}
}