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

Fix NPE if provided allocation is null

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-06-06 14:02:53 +02:00
parent d7e7634028
commit f4fc8f53d3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
View file

@ -671,13 +671,17 @@ public abstract class AllocationRow {
}
private void loadResourcesPerDayFrom(ResourceAllocation<?> allocation) {
setResourcesPerDayEditedValue(extractEditedValueFrom(allocation));
}
private ResourcesPerDay extractEditedValueFrom(
ResourceAllocation<?> allocation) {
if (allocation == null) {
setResourcesPerDayEditedValue(ResourcesPerDay.amount(0));
return ResourcesPerDay.amount(0);
}
boolean useIntention = currentCalculatedValue != CalculatedValue.RESOURCES_PER_DAY;
setResourcesPerDayEditedValue(useIntention ? allocation
.getIntendedResourcesPerDay() : allocation
.getNonConsolidatedResourcePerDay());
return useIntention ? allocation.getIntendedResourcesPerDay()
: allocation.getNonConsolidatedResourcePerDay();
}
public abstract ResourceEnum getType();