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

ItEr36S07ValidacionEProbasFuncionaisItEr35S08: Fixed NullPointerException.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-11-25 11:46:35 +01:00 • committed by Javier Moran Rua
parent c99c0b0aca
commit 3cde93298a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
View file

@ -336,9 +336,12 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
resourceDAO.list(Resource.class), start, finish);
for (LocalDate day : mapDayAssignments.keySet()) {
Integer overloadHours = mapDayAssignments.get(day);
Integer maxHours = mapMaxAvailability.get(day);
mapDayAssignments.put(day, overloadHours + maxHours);
if ((day.compareTo(new LocalDate(start)) >= 0)
&& (day.compareTo(new LocalDate(finish)) <= 0)) {
Integer overloadHours = mapDayAssignments.get(day);
Integer maxHours = mapMaxAvailability.get(day);
mapDayAssignments.put(day, overloadHours + maxHours);
}
}
String uri = getServletUri(mapDayAssignments, start, finish);