From c980d96b82aa7cfe7d67d016af7e54f6d70f917b Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 30 Sep 2011 12:41:55 +0200
Subject: [PATCH] Revert "[Bug #1191] avoid null pointer exception"

This reverts commit 662fd3b2d3a0aaf8d9c872b311cb6d0cf31e1502.
---
 .../navalplanner/business/workingday/EffortDuration.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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 25148831c..ce592bd14 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,12 +282,7 @@ public class EffortDuration implements Comparable<EffortDuration> {
      *         {@link EffortDuration} and the other duration
      */
     public EffortDuration plus(EffortDuration other) {
-        if (other != null){
-            return new EffortDuration(seconds + other.seconds);
-        }
-        else{
-            return new EffortDuration(seconds);
-        }
+        return new EffortDuration(seconds + other.seconds);
     }
 
     public boolean isZero() {