From cb55f928b607d2a7f33b21f85cbfa29356eddefc Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 19 Mar 2012 12:52:15 +0100 Subject: [PATCH] Prevent NPE calculating money cost for a TaskElement FEA: ItEr76S17MoneyCostMonitoringSystem --- .../org/libreplan/web/planner/TaskElementAdapter.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java index 2596d4aaf..c83ae631f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java @@ -609,10 +609,18 @@ public class TaskElementAdapter { } private BigDecimal getBudget() { + if ((taskElement == null) + || (taskElement.getOrderElement() == null)) { + return BigDecimal.ZERO; + } return taskElement.getOrderElement().getBudget(); } private BigDecimal getMoneyCost() { + if ((taskElement == null) + || (taskElement.getOrderElement() == null)) { + return BigDecimal.ZERO; + } return transactionService .runOnReadOnlyTransaction(new IOnTransaction() {