From 3fb6c09763fb1398e72ab598ee22e8e2d1e562ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 7 Jun 2010 13:30:43 +0200 Subject: [PATCH] ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #481] Fixing bug Start time can be null so taking it into account. --- .../business/planner/limiting/entities/Gap.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java index 28b1ba344..6946d6012 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java @@ -226,11 +226,18 @@ public class Gap implements Comparable { } @Override - public int compareTo(Gap o) { - if (o == null) { + public int compareTo(Gap other) { + if (other == null) { return 1; } - return this.getStartTime().compareTo(o.getStartTime()); + if (this.getStartTime() == null && other.getStartTime() == null) { + return 0; + } else if (this.getStartTime() == null) { + return -1; + } else if (other.getStartTime() == null) { + return 1; + } + return this.getStartTime().compareTo(other.getStartTime()); } public boolean isBefore(Gap gap) {