From e56f022cd9f90c6aaa64a625699a7a1cd0ea353e Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Mon, 14 Feb 2011 11:15:15 +0100 Subject: [PATCH] Fixed nullpointer exception on work week date picker FEA: ItEr70S04BugFixing --- .../web/common/components/EffortDurationPicker.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java index f965f60bc..191914637 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java @@ -133,9 +133,11 @@ public class EffortDurationPicker extends Hbox { Integer hoursValue = hours.getValue(); Integer minutesValue = minutes.getValue(); Integer secondsValue = seconds.getValue(); - EffortDuration newValue = EffortDuration.hours(hoursValue) - .and(minutesValue, Granularity.MINUTES) - .and(secondsValue, Granularity.SECONDS); + EffortDuration newValue = EffortDuration.hours( + hoursValue != null ? hoursValue : 0).and( + minutesValue != null ? minutesValue : 0, Granularity.MINUTES) + .and(secondsValue != null ? secondsValue : 0, + Granularity.SECONDS); return newValue; }