RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #541] Fix bug.

Browse source 
Now it handles nulls
This commit is contained in:
Óscar González Fernández 2010-06-28 14:06:05 +02:00
parent 4d5fa2a1e1
commit 6cb3d39329
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java
View file

@ -172,9 +172,9 @@ public class LimitingResourceQueueElement extends BaseEntity {
public void add(LimitingResourceQueueDependency d) {
Validate.notNull(d);
if (d.getHasAsOrigin().getId().equals(this.getId())) {
if (sameInDB(d.getHasAsOrigin())) {
dependenciesAsOrigin.add(d);
} else if (d.getHasAsDestiny().getId().equals(this.getId())) {
} else if (sameInDB(d.getHasAsDestiny())) {
dependenciesAsDestiny.add(d);
} else {
throw new IllegalArgumentException(
@ -184,6 +184,11 @@ public class LimitingResourceQueueElement extends BaseEntity {
}
}
private boolean sameInDB(LimitingResourceQueueElement other) {
return this == other || other.getId() != null && this.getId() != null
&& other.getId().equals(this.getId());
}
public void remove(LimitingResourceQueueDependency d) {
if (dependenciesAsOrigin.contains(d))
dependenciesAsOrigin.remove(d);