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

ItEr18S14CUAsignacionRecursosEspecificosAPlanificacion: Corrected load of criterions to avoid

Browse source 
LazyInitializationException and duplicated objects in the session.
This commit is contained in:
Javier Moran Rua 2009-07-27 22:24:58 +02:00
parent d358e8dab9
commit fd7b4648fa
1 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.hibernate.LockMode;
import org.hibernate.SessionFactory;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.orders.daos.IHoursGroupDao;
import org.navalplanner.business.orders.entities.HoursGroup;
@ -26,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* Model for UI operations related to {@link Task}.
* Model for UI operations related to {@link Task}
*
* @author Manuel Rego Casasnovas <mrego@igalia.com>
*/
@ -40,6 +42,9 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
@Autowired
private IWorkerDao workerDAO;
@Autowired
private SessionFactory sessionFactory;
@Autowired
private IHoursGroupDao hoursGroupDAO;
@ -139,28 +144,38 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
}
@Override
@Transactional(readOnly=true)
public Worker getWorker() {
if (resourceAllocation == null) {
return null;
}
return ((SpecificResourceAllocation) resourceAllocation).getWorker();
Worker worker = ((SpecificResourceAllocation) resourceAllocation)
.getWorker();
if(worker == null) {
return null;
}
try {
return workerDAO.find(worker.getId());
} catch (InstanceNotFoundException e) {
throw new RuntimeException(e);
}
}
@Override
@Transactional(readOnly = true)
public boolean workerSatisfiesCriterions() {
for (Criterion criterion : getCriterions()) {
sessionFactory.getCurrentSession().lock(criterion, LockMode.NONE);
}
Worker worker = getWorker();
if (worker == null) {
return true;
}
List<ICriterion> criterions = new ArrayList<ICriterion>(getCriterions());
if (criterions.isEmpty()) {
return true;
}
ICriterion compositedCriterion = CriterionCompounder.buildAnd(criterions)
.getResult();
ICriterion compositedCriterion = CriterionCompounder.buildAnd(
new ArrayList<ICriterion>(getCriterions())).getResult();
return compositedCriterion.isSatisfiedBy(worker);
}
}