From 37f8f2fba998c8385189029f1d32ecfeb1249d3e Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 15 Feb 2011 09:55:11 +0100 Subject: [PATCH] Added warning log message when fake advance is NULL in ManageOrderElementAdvancesModel. FEA: ItEr70S04BugFixing --- .../orders/ManageOrderElementAdvancesModel.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java index f55899576..97b90d753 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java @@ -37,6 +37,8 @@ import java.util.SortedSet; import java.util.TreeSet; import org.apache.commons.lang.Validate; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; import org.navalplanner.business.advance.bootstrap.PredefinedAdvancedTypes; import org.navalplanner.business.advance.daos.IAdvanceAssignmentDAO; @@ -71,6 +73,9 @@ import org.zkoss.zul.XYModel; public class ManageOrderElementAdvancesModel implements IManageOrderElementAdvancesModel { + private static final Log LOG = LogFactory + .getLog(ManageOrderElementAdvancesModel.class); + @Autowired private final IAdvanceTypeDAO advanceTypeDAO; @@ -233,8 +238,15 @@ public class ManageOrderElementAdvancesModel implements .getIndirectAdvanceAssignments()) { each.getCalculatedConsolidation().size(); each.getAdvanceType().getUnitName(); - forceLoadAdvanceConsolidatedValues(orderElement - .calculateFakeDirectAdvanceAssignment(each)); + DirectAdvanceAssignment fakedDirect = orderElement + .calculateFakeDirectAdvanceAssignment(each); + if (fakedDirect != null) { + forceLoadAdvanceConsolidatedValues(fakedDirect); + } else { + LOG + .warn("Fake direct advance assignment shouldn't be NULL for type '" + + each.getAdvanceType().getUnitName() + "'"); + } } }