From a3ccebfbc36eb1ceb24a04645d17abb1031b4eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 8 Feb 2010 11:36:55 +0100 Subject: [PATCH] ItEr46S04ValidacionEProbasFuncionaisItEr45S04: Fixing problem loading a scheduling with a milestone. Working hours are only loaded if task source exists, e.g. it's not a milestone. --- .../web/planner/order/OrderPlanningModel.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 8e8c3ebd9..9128c3eb8 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -809,13 +809,15 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { private void forceLoadOfWorkingHours(List initial) { for (TaskElement taskElement : initial) { - taskElement.getTaskSource().getTotalHours(); - OrderElement orderElement = taskElement.getOrderElement(); - if (orderElement != null) { - orderElement.getWorkHours(); - } - if (!taskElement.isLeaf()) { - forceLoadOfWorkingHours(taskElement.getChildren()); + if (taskElement.getTaskSource() != null) { + taskElement.getTaskSource().getTotalHours(); + OrderElement orderElement = taskElement.getOrderElement(); + if (orderElement != null) { + orderElement.getWorkHours(); + } + if (!taskElement.isLeaf()) { + forceLoadOfWorkingHours(taskElement.getChildren()); + } } } }