[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:
parent
69770b3955
commit
faa68a5256
1 changed files with 1 additions and 3 deletions
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue