From 4353465efe17fa81b251f65bbbc3bd4e22d2c2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Thu, 9 Feb 2012 19:33:25 +0100 Subject: [PATCH] Bug #1343: Prevent NullPointerException when showing default filtering dates on company view. If the company view is empty, these dates are null but we weren't taking this case into account. FEA: ItEr76S04BugFixing --- .../planner/company/CompanyPlanningController.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java index 52d3fa9e7..87a9ed77a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java @@ -290,10 +290,14 @@ public class CompanyPlanningController implements Composer { if (listFilters.isEmpty() && startDate == null && finishDate == null) { IPredicate predicate = model.getDefaultPredicate(includeOrderElements); //show filter dates calculated by default on screen - filterStartDate.setValue(model.getFilterStartDate(). - toDateMidnight().toDate()); - filterFinishDate.setValue(model.getFilterFinishDate(). - toDateMidnight().toDate()); + if(model.getFilterStartDate() != null) { + filterStartDate.setValue(model.getFilterStartDate(). + toDateMidnight().toDate()); + } + if(model.getFilterFinishDate() != null) { + filterFinishDate.setValue(model.getFilterFinishDate(). + toDateMidnight().toDate()); + } return predicate; } return new TaskGroupPredicate(listFilters, startDate, finishDate,