RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #962] Avoid nulls in merging process

Browse source 
FEA: ItEr73S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-04-02 21:14:16 +02:00
parent 24edef10ec
commit 059974d8d5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java
View file

@ -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) {

6
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
View file

@ -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;