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

ItEr41S16ImplantacionAplicacionItEr40S21: [Bug #222] Fixing bug. Checking resource's calendar is not null.

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-01 19:37:29 +01:00
parent 5b70a4eda0
commit 6f1d1ebb04
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
View file

@ -317,7 +317,9 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
private void reattachResource(Resource resource) {
resourceDAO.reattach(resource);
reattachCriterionSatisfactions(resource.getCriterionSatisfactions());
calendarDAO.reattachUnmodifiedEntity(resource.getCalendar());
if (resource.getCalendar() != null) {
calendarDAO.reattachUnmodifiedEntity(resource.getCalendar());
}
for (DayAssignment dayAssignment : resource.getAssignments()) {
Hibernate.initialize(dayAssignment);
}