From 487c43c99e2d067da290c614ad1470935bcf16cf Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Wed, 30 Mar 2011 17:17:05 +0200
Subject: [PATCH] [Bug #958] Fix NullPointerException in progress assignment
 pop-up

FEA: ItEr73S04BugFixing
---
 .../business/advance/entities/DirectAdvanceAssignment.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java
index 6f351a073..520597ccb 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java
@@ -137,7 +137,7 @@ public class DirectAdvanceAssignment extends AdvanceAssignment {
 
         AdvanceMeasurement advanceMeasurement = (date != null) ? getAdvanceMeasurement(date)
                 : getLastAdvanceMeasurement();
-        if (advanceMeasurement == null) {
+        if (advanceMeasurement == null || advanceMeasurement.getValue() == null) {
             return BigDecimal.ZERO;
         }
         return advanceMeasurement.getValue().divide(maxValue, 4,