From faa68a525614e3f32fcbfb22262acb3407f2f379 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Fri, 25 Feb 2011 17:43:03 +0100
Subject: [PATCH] [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
---
 .../org/navalplanner/web/limitingresources/QueuesState.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueuesState.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueuesState.java
index 09859645a..5bee98421 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueuesState.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueuesState.java
@@ -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);
             }
         }