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

ItEr38S08CUAdministracionCategoriaCosteItEr37S12: solved a bug when comparing correct infinite time intervals

Browse source 
When a correct time interval involving one infinite element was checked,
a NullPointerException could be produced depending on the order of the
time intervals inside the array. It's solved.
This commit is contained in:
Jacobo Aragunde Pérez 2009-12-08 12:50:34 +01:00 • committed by Javier Moran Rua
parent 9d98a667dc
commit 24056465c1
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java
View file

@ -106,10 +106,11 @@ public class CostCategory extends BaseEntity {
(listElement.getEndDate() == null && listElement.getInitDate().compareTo(endDate)<=0)) {
overlap = true;
}
else if((listElement.getEndDate().compareTo(initDate)>=0 &&
else if((endDate != null && listElement.getEndDate() != null) &&
((listElement.getEndDate().compareTo(initDate)>=0 &&
listElement.getEndDate().compareTo(endDate)<=0) ||
(listElement.getInitDate().compareTo(initDate)>=0 &&
listElement.getInitDate().compareTo(endDate)<=0)) {
listElement.getInitDate().compareTo(endDate)<=0))) {
overlap = true;
}
}
@ -134,10 +135,11 @@ public class CostCategory extends BaseEntity {
(listElement.getEndDate() == null && listElement.getInitDate().compareTo(endDate)<=0)) {
return true;
}
else if((listElement.getEndDate().compareTo(initDate)>=0 &&
else if((endDate != null && listElement.getEndDate() != null) &&
((listElement.getEndDate().compareTo(initDate)>=0 &&
listElement.getEndDate().compareTo(endDate)<=0) ||
(listElement.getInitDate().compareTo(initDate)>=0 &&
listElement.getInitDate().compareTo(endDate)<=0)) {
listElement.getInitDate().compareTo(endDate)<=0))) {
return true;
}
}

5
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
View file

@ -766,10 +766,11 @@ public abstract class Resource extends BaseEntity{
(listElement.getEndDate() == null && listElement.getInitDate().compareTo(endDate)<=0)) {
return true;
}
else if((listElement.getEndDate().compareTo(initDate)>=0 &&
else if((endDate != null && listElement.getEndDate() != null) &&
((listElement.getEndDate().compareTo(initDate)>=0 &&
listElement.getEndDate().compareTo(endDate)<=0) ||
(listElement.getInitDate().compareTo(initDate)>=0 &&
listElement.getInitDate().compareTo(endDate)<=0)) {
listElement.getInitDate().compareTo(endDate)<=0))) {
return true;
}
}