diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityDAO.java index 31ad3f49952bd982aacce3d94f64ecb51e24a587..d0cdbff064a7e75d12f6cade9d3a8749b38e9e1e 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityDAO.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityDAO.java @@ -107,7 +107,7 @@ public abstract class AbstractGenericEntityDAO<T extends IIdHolder> extends Abst criteria.add(Restrictions.eq("id", techId.getId())); for (String connection : connections) { - criteria.setFetchMode(connection, FetchMode.JOIN); + criteria.setFetchMode(connection, FetchMode.SELECT); } final T result = tryGetEntity(criteria.uniqueResult()); if (operationLog.isDebugEnabled()) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAO.java index d6e04af76dae7c997d2df43b337b2f105887728b..c4f51407518088bf73067d29090482c625df44ff 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAO.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAO.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Set; import org.apache.log4j.Logger; +import org.hibernate.FetchMode; import org.hibernate.SessionFactory; import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Order; @@ -124,6 +125,11 @@ public class MetaprojectDAO extends AbstractGenericEntityDAO<MetaprojectPE> impl criteria.createAlias("metaproject", "m"); criteria.add(Restrictions.eq("m.owner", owner)); criteria.add(Restrictions.eq(entity.getEntityKind().getLabel(), entity)); + criteria.setFetchMode("experiment", FetchMode.SELECT); + criteria.setFetchMode("dataSet", FetchMode.SELECT); + criteria.setFetchMode("material", FetchMode.SELECT); + criteria.setFetchMode("sample", FetchMode.SELECT); + final List<MetaprojectAssignmentPE> assignments = cast(getHibernateTemplate().findByCriteria(criteria));