From 02993b55eadeca352f2f378474372bdb7e380326 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 26 Dec 2011 13:23:15 +0100
Subject: [PATCH] Prevent NPE editing progress measurements

FEA: ItEr75S04BugFixing
---
 .../web/orders/ManageOrderElementAdvancesController.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java
index d27932012..07a9156d1 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java
@@ -1362,8 +1362,11 @@ public class ManageOrderElementAdvancesController extends
             } else {
                 String errorMessage = validateDateAdvanceMeasurement(
                         new LocalDate(value), advanceMeasurement);
-                ((Datebox) comp).setValue(advanceMeasurement.getDate()
-                        .toDateTimeAtStartOfDay().toDate());
+                LocalDate date = advanceMeasurement.getDate();
+                if (date != null) {
+                    ((Datebox) comp).setValue(date.toDateTimeAtStartOfDay()
+                            .toDate());
+                }
                 if (errorMessage != null) {
                     throw new WrongValueException(comp, errorMessage);
                 }