From 059974d8d534267f6c4be9a80f519f002caed5fe Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Sat, 2 Apr 2011 21:14:16 +0200 Subject: [PATCH] [Bug #962] Avoid nulls in merging process FEA: ItEr73S04BugFixing --- .../business/advance/entities/AdvanceMeasurement.java | 2 +- .../business/orders/entities/OrderLineGroup.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java index bf435cb97..88c1d0824 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java @@ -95,7 +95,7 @@ public class AdvanceMeasurement extends BaseEntity { @NotNull(message = "value not specified") public BigDecimal getValue() { - return this.value; + return value != null ? value : BigDecimal.ZERO; } public void setAdvanceAssignment(AdvanceAssignment advanceAssignment) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java index 730475ec8..5cd7bf101 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java @@ -538,9 +538,9 @@ public class OrderLineGroup extends OrderElement implements next2 = null; } - BigDecimal previous1 = new BigDecimal(0); - BigDecimal previous2 = new BigDecimal(0); - BigDecimal previousResult = new BigDecimal(0); + BigDecimal previous1 = BigDecimal.ZERO; + BigDecimal previous2 = BigDecimal.ZERO; + BigDecimal previousResult = BigDecimal.ZERO; LocalDate date; BigDecimal add;