From f65ea30bbdb2e6b44cabc5e23d4f7daf5e3f441e Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 12 Nov 2012 11:18:02 +0000
Subject: [PATCH] Use managed query rather than data source for
experimentSampleQuery.
SVN: 27567
---
.../server/dataaccess/db/ExperimentDAO.java | 23 +++----------------
1 file changed, 3 insertions(+), 20 deletions(-)
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 7a27bfb76de..3df5c0e32d6 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
@@ -87,8 +87,7 @@ public class ExperimentDAO extends AbstractGenericEntityWithPropertiesDAO<Experi
final DatabaseInstancePE databaseInstance)
{
super(persistencyResources, databaseInstance, ExperimentPE.class);
- this.experimentSampleQuery =
- QueryTool.getQuery(getDataSource(), IExperimentSampleQuery.class);
+ this.experimentSampleQuery = QueryTool.getManagedQuery(IExperimentSampleQuery.class);
}
@Override
@@ -376,29 +375,13 @@ public class ExperimentDAO extends AbstractGenericEntityWithPropertiesDAO<Experi
private List<Long> getSampleIds(ExperimentPE experiment)
{
- try
- {
- return experimentSampleQuery.getExperimentSampleIds(experiment.getId());
- } finally
- {
- // Force explicitly returning the database connection as otherwise we have a database
- // connection leak here.
- experimentSampleQuery.close();
- }
+ return experimentSampleQuery.getExperimentSampleIds(experiment.getId());
}
@Override
public List<String> getSampleCodes(ExperimentPE experiment)
{
- try
- {
- return experimentSampleQuery.getExperimentSampleCodes(experiment.getId());
- } finally
- {
- // Force explicitly returning the database connection as otherwise we have a database
- // connection leak here.
- experimentSampleQuery.close();
- }
+ return experimentSampleQuery.getExperimentSampleCodes(experiment.getId());
}
@Override
--
GitLab