From 2858d295475fc54d4ecf7a67a76a8b3a740bc06e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Sun, 3 Oct 2010 13:34:20 +0200
Subject: [PATCH] Fix bug

The dates can be null so it must be checked

FEA: ItEr61S05BugFixing
---
 .../web/planner/company/CompanyPlanningModel.java           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
index e43802951..d02b064a0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
@@ -736,8 +736,10 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
             endDate = Collections.max(notNull(endDate, each.getDeadline(),
                     associatedTaskElement.getEndDate()));
         }
-        filterStartDate = LocalDate.fromDateFields(startDate);
-        filterFinishDate = LocalDate.fromDateFields(endDate);
+        filterStartDate = startDate != null ? LocalDate
+                .fromDateFields(startDate) : null;
+        filterFinishDate = endDate != null ? LocalDate.fromDateFields(endDate)
+                : null;
     }
 
     private static <T> List<T> notNull(T... values) {