From 46600cbc8b970cd6ded31309729de69b309c4534 Mon Sep 17 00:00:00 2001 From: Javier Moran Rua Date: Sun, 13 Jun 2010 15:54:13 +0200 Subject: [PATCH] ItEr57S04ValidacionEProbasFuncionaisItEr56S04: [Bug #499] Compare by id instead of == on adding dependencies. The former code to add dependencies provokes error when one of the LimitingResourceQueueElement in which a depencency is going to be added (as origin or as destiny) is a proxy (although it has been initialized). --- .../limiting/entities/LimitingResourceQueueElement.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java index a31bbdbd7..1e22dc113 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java @@ -169,9 +169,9 @@ public class LimitingResourceQueueElement extends BaseEntity { public void add(LimitingResourceQueueDependency d) { Validate.notNull(d); - if (d.getHasAsOrigin().equals(this)) { + if (d.getHasAsOrigin().getId().equals(this.getId())) { dependenciesAsOrigin.add(d); - } else if (d.getHasAsDestiny().equals(this)) { + } else if (d.getHasAsDestiny().getId().equals(this.getId())) { dependenciesAsDestiny.add(d); } else { throw new IllegalArgumentException(