From d8df6fca7bfd205d10bd656175f16809ec2d723c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 5 Dec 2012 11:11:35 +0000
Subject: [PATCH] SP-406, BIS-279: Reverting adding locks for sample parents
because MultiThreadSampleOptimisticLockingTest breaks
SVN: 27868
---
.../cisd/openbis/generic/server/dataaccess/db/SampleDAO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java
index b897b9a6b6a..9579800e6c6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java
@@ -88,7 +88,7 @@ public class SampleDAO extends AbstractGenericEntityWithPropertiesDAO<SamplePE>
}
lockEntity(sample.getExperiment());
lockEntity(sample.getContainer());
- lockEntities(sample.getParents());
+ // lockEntities(sample.getParents());
hibernateTemplate.saveOrUpdate(sample);
if (doLog && operationLog.isInfoEnabled())
{
--
GitLab