From f4fc8f53d3e5612f08989d68e39fa2a7e66e88b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 6 Jun 2011 14:02:53 +0200
Subject: [PATCH] Fix NPE if provided allocation is null

FEA: ItEr74S04BugFixing
---
 .../web/planner/allocation/AllocationRow.java        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
index 2c21976d9..e2469e6b7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
@@ -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();