From 996783c9a852d1cfdf98cebfae84890a9175e16c Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 15 Nov 2011 12:01:18 +0100 Subject: [PATCH] [Bug #1257] Prevent saving null TaskSource The error happens becase of milestones don't have TaskSource. FEA: ItEr75S04BugFixing --- .../org/libreplan/web/planner/order/SaveCommandBuilder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java index 2b0bb4cfe..9f3e20810 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java @@ -56,6 +56,7 @@ import org.libreplan.business.orders.entities.HoursGroup; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.business.orders.entities.OrderLineGroup; +import org.libreplan.business.orders.entities.TaskSource; import org.libreplan.business.planner.daos.IConsolidationDAO; import org.libreplan.business.planner.daos.IDependencyDAO; import org.libreplan.business.planner.daos.ISubcontractedTaskDataDAO; @@ -568,7 +569,10 @@ public class SaveCommandBuilder { } private void saveTaskSources(TaskElement taskElement) { - taskSourceDAO.save(taskElement.getTaskSource()); + TaskSource taskSource = taskElement.getTaskSource(); + if (taskSource != null) { + taskSourceDAO.save(taskSource); + } if (taskElement.isLeaf()) { return; }