From 662fd3b2d3a0aaf8d9c872b311cb6d0cf31e1502 Mon Sep 17 00:00:00 2001
From: Cristina Alvarino <cristina.alvarino@comtecsf.es>
Date: Wed, 28 Sep 2011 13:16:56 +0200
Subject: [PATCH] [Bug #1191] avoid null pointer exception

FEA: ItEr75S04BugFixing
---
 .../navalplanner/business/workingday/EffortDuration.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
index ce592bd14..25148831c 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
@@ -282,7 +282,12 @@ public class EffortDuration implements Comparable<EffortDuration> {
      *         {@link EffortDuration} and the other duration
      */
     public EffortDuration plus(EffortDuration other) {
-        return new EffortDuration(seconds + other.seconds);
+        if (other != null){
+            return new EffortDuration(seconds + other.seconds);
+        }
+        else{
+            return new EffortDuration(seconds);
+        }
     }
 
     public boolean isZero() {