diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java index f59947425..a19b59b30 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java @@ -592,9 +592,10 @@ public abstract class ResourceAllocation extends private AvailabilityTimeLine getAvailability() { AvailabilityTimeLine resourcesAvailability = getResourcesAvailability(); - if (getTaskCalendar() != null) { - return getTaskCalendar().getAvailability().and( - resourcesAvailability); + BaseCalendar taskCalendar = getTask().getCalendar(); + if (taskCalendar != null) { + return taskCalendar.getAvailability() + .and(resourcesAvailability); } else { return resourcesAvailability; } @@ -754,20 +755,16 @@ public abstract class ResourceAllocation extends } private IWorkHours getTaskWorkHours() { - if (getTaskCalendar() == null) { + if (getTask().getCalendar() == null) { return SameWorkHoursEveryDay.getDefaultWorkingDay(); } else { - return getTaskCalendar(); + return getTask().getCalendar(); } } protected abstract IWorkHours getWorkHoursGivenTaskHours( IWorkHours taskWorkHours); - protected final BaseCalendar getTaskCalendar() { - return getTask().getCalendar(); - } - private void resetGenericAssignmentsTo(List assignments) { resetAssignmentsTo(cast(assignments)); }