diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java index b2f484c31..bcd8f5d91 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java @@ -116,6 +116,9 @@ public class HoursWorkedPerWorkerController extends NavalplannerReportController } private Date getStartingDate() { + if (startingDate.getValue() == null) { + return null; + } Calendar calendar = Calendar.getInstance(); calendar.setTime(startingDate.getValue()); calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), @@ -124,6 +127,9 @@ public class HoursWorkedPerWorkerController extends NavalplannerReportController } private Date getEndingDate() { + if (endingDate.getValue() == null) { + return null; + } Calendar calendar = Calendar.getInstance(); calendar.setTime(endingDate.getValue()); calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), @@ -334,4 +340,4 @@ public class HoursWorkedPerWorkerController extends NavalplannerReportController private String getParameterLabels() { return hoursWorkedPerWorkerModel.getSelectedLabel(); } -} \ No newline at end of file +}