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

Prevent NPE in OrderElement::getSumChargedEffort()

Browse source 
Now SumChargeEffort objects are not created till some hours are reported, so it
could be null in some cases.

FEA: ItEr76S14ConcurrencyProblemWorkReports
This commit is contained in:
Manuel Rego Casasnovas 2012-03-30 16:12:51 +02:00
parent abc0e0fe66
commit dfb0090666
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java
View file

@ -126,7 +126,8 @@ public class OrderLine extends OrderElement {
if (!getMaterialAssignments().isEmpty()) {
return false;
}
if (!getSumChargedEffort().getDirectChargedEffort().isZero()) {
if (getSumChargedEffort() != null
&& !getSumChargedEffort().getDirectChargedEffort().isZero()) {
return false;
}
if (!getTaskElements().isEmpty()) {

2
libreplan-business/src/test/java/org/libreplan/business/test/orders/daos/OrderElementDAOTest.java
View file

@ -59,6 +59,7 @@ import org.libreplan.business.orders.entities.Order;
import org.libreplan.business.orders.entities.OrderElement;
import org.libreplan.business.orders.entities.OrderLine;
import org.libreplan.business.orders.entities.OrderLineGroup;
import org.libreplan.business.orders.entities.SumChargedEffort;
import org.libreplan.business.qualityforms.daos.IQualityFormDAO;
import org.libreplan.business.qualityforms.entities.QualityForm;
import org.libreplan.business.qualityforms.entities.TaskQualityForm;
@ -420,6 +421,7 @@ public class OrderElementDAOTest {
@Test
public void testSumChargedHoursRelation() throws InstanceNotFoundException {
OrderLine orderLine = createValidOrderLine();
orderLine.setSumChargedEffort(SumChargedEffort.create(orderLine));
orderLine.getSumChargedEffort().addDirectChargedEffort(
EffortDuration.hours(8));

2
libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementModel.java
View file

@ -156,7 +156,7 @@ public class AssignedHoursToOrderElementModel implements
@Override
public EffortDuration getTotalAssignedEffort() {
if (orderElement == null) {
if (orderElement == null || orderElement.getSumChargedEffort() == null) {
return EffortDuration.zero();
}
return this.orderElement.getSumChargedEffort().getTotalChargedEffort();