From 5e6d7c28007fcc1f733210da0d4f67c9fac981dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 6 Sep 2010 12:19:44 +0200 Subject: [PATCH] Use the current specified scenario instead of retrieving it each time FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04 --- .../org/navalplanner/business/resources/entities/Resource.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java index 26ea269a5..6b57b2ca1 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java @@ -188,10 +188,9 @@ public abstract class Resource extends IntegrationEntity { @Override List calculateAssignments() { List result = new ArrayList(); - Scenario current = Registry.getScenarioManager().getCurrent(); for (DayAssignment each : dayAssignments) { if (isTransient(each) - || each.getScenario().equals(current)) { + || each.getScenario().equals(currentScenario)) { result.add(each); } }