From fa4003fc9e9ef9884a547c5a4480368ca34b1eba Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 16 Jun 2010 08:17:25 +0000
Subject: [PATCH] minor: fixed error message in sample batch import when code
is not unique
SVN: 16541
---
.../server/dataaccess/db/SampleDAO.java | 49 +++++++++++--------
1 file changed, 29 insertions(+), 20 deletions(-)
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 110e441139a..14393ef0103 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
@@ -178,23 +178,8 @@ public class SampleDAO extends AbstractGenericEntityDAO<SamplePE> implements ISa
internalCreateSample(sample, hibernateTemplate,
new ClassValidator<SamplePE>(SamplePE.class), true);
- try
- {
- hibernateTemplate.flush();
- } catch (UncategorizedSQLException e)
- {
- // need to deal with exception thrown by trigger checking code uniqueness
- final SQLException sqlExceptionOrNull =
- ExceptionUtils.tryGetThrowableOfClass(e, SQLException.class);
- if (sqlExceptionOrNull != null && sqlExceptionOrNull.getNextException() != null)
- {
- throw new DataIntegrityViolationException(sqlExceptionOrNull.getNextException()
- .getMessage());
- } else
- {
- throw e;
- }
- }
+
+ flushWithSqlExceptionHandling(hibernateTemplate);
}
public List<SamplePE> listSamplesWithPropertiesByExperiment(final ExperimentPE experiment)
@@ -474,7 +459,9 @@ public class SampleDAO extends AbstractGenericEntityDAO<SamplePE> implements ISa
{
operationLog.info(String.format("ADD: %d samples.", samples.size()));
}
- hibernateTemplate.flush();
+
+ // TODO 2010-06-16, Piotr Buczek: is memory usage increasing without clear of session?
+ flushWithSqlExceptionHandling(getHibernateTemplate());
}
public final void updateSample(final SamplePE sample) throws DataAccessException
@@ -482,9 +469,9 @@ public class SampleDAO extends AbstractGenericEntityDAO<SamplePE> implements ISa
assert sample != null : "Unspecified sample";
validatePE(sample);
- final HibernateTemplate hibernateTemplate = getHibernateTemplate();
+ getHibernateTemplate().flush();
+ flushWithSqlExceptionHandling(getHibernateTemplate());
- hibernateTemplate.flush();
if (operationLog.isInfoEnabled())
{
operationLog.info("UPDATE: sample '" + sample + "'.");
@@ -507,4 +494,26 @@ public class SampleDAO extends AbstractGenericEntityDAO<SamplePE> implements ISa
return list;
}
+ private static void flushWithSqlExceptionHandling(HibernateTemplate hibernateTemplate)
+ throws DataAccessException
+ {
+ try
+ {
+ hibernateTemplate.flush();
+ } catch (UncategorizedSQLException e)
+ {
+ // need to deal with exception thrown by trigger checking code uniqueness
+ final SQLException sqlExceptionOrNull =
+ ExceptionUtils.tryGetThrowableOfClass(e, SQLException.class);
+ if (sqlExceptionOrNull != null && sqlExceptionOrNull.getNextException() != null)
+ {
+ throw new DataIntegrityViolationException(sqlExceptionOrNull.getNextException()
+ .getMessage());
+ } else
+ {
+ throw e;
+ }
+ }
+ }
+
}
--
GitLab