diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java index 7887fd8d0bdecc547755f5ebf3149282ff24635e..9f2a597ff192c8c177cdd596c34fd2c1a0f7facc 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java @@ -592,8 +592,7 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt experimentTable.load(experimentType.getCode(), projectIdentifier); final List<ExperimentPE> experiments = experimentTable.getExperiments(); Collections.sort(experiments); - return ExperimentTranslator.translate(experiments, session.getBaseIndexURL(), - ExperimentTranslator.LoadableFields.PROPERTIES); + return ExperimentTranslator.translate(experiments, session.getBaseIndexURL()); } public final List<ExperimentType> listExperimentTypes(final String sessionToken) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java index 6e4e157c01f4e94293d15302c245e00e1169cb6a..9051857dde95861f7e3776937786ed4f04da0095 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java @@ -547,8 +547,7 @@ public class ETLService extends AbstractCommonServer<IETLService> implements IET experimentTable.load(EntityType.ALL_TYPES_CODE, projectIdentifier); final List<ExperimentPE> experiments = experimentTable.getExperiments(); Collections.sort(experiments); - return ExperimentTranslator.translate(experiments, session.getBaseIndexURL(), - ExperimentTranslator.LoadableFields.PROPERTIES); + return ExperimentTranslator.translate(experiments, session.getBaseIndexURL()); } public IEntityProperty[] tryToGetPropertiesOfTopSampleRegisteredFor(String sessionToken, diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java index 8df5e208f7bd2291f5f198b5eb6b6864d503c193..4edc5d272416ec0bd5dbd6ec33f3cfe7a0657e67 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java @@ -79,7 +79,6 @@ public class ExperimentDAO extends AbstractGenericEntityWithPropertiesDAO<Experi { criteria.add(Restrictions.eq("projectInternal", projectOrNull)); } - criteria.setFetchMode("experimentProperties", FetchMode.JOIN); criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); final List<ExperimentPE> list = cast(getHibernateTemplate().findByCriteria(criteria)); if (operationLog.isDebugEnabled()) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java index b78d6691fc41790ecdabdc17ae150c020c9e9444..0b2d95e90c9f3fb666c01ffd4cba32d877a26ef4 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java @@ -118,12 +118,13 @@ public final class ExperimentTranslator // NOTE: when translating list of experiments managed properties will contain raw value public final static List<Experiment> translate(final List<ExperimentPE> experiments, - String baseIndexURL, final LoadableFields... withFields) + String baseIndexURL) { final List<Experiment> result = new ArrayList<Experiment>(experiments.size()); for (final ExperimentPE experiment : experiments) { - result.add(ExperimentTranslator.translate(experiment, baseIndexURL, true, withFields)); + HibernateUtils.initialize(experiment.getProperties()); + result.add(ExperimentTranslator.translate(experiment, baseIndexURL, true, LoadableFields.PROPERTIES)); } return result; }