This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 8690ac9d3c8e864dbb6e13d085f1dcd9f246612f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 9 19:20:48 2016 +0200 Meilleure gestion de la suppression d'un ImportLog --- .../fr/ifremer/echobase/entities/ImportFileTopiaDao.java | 15 ++++++++++++--- .../fr/ifremer/echobase/entities/ImportLogTopiaDao.java | 6 ++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java index 3652e79..281dd4b 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java @@ -9,9 +9,18 @@ public class ImportFileTopiaDao extends AbstractImportFileTopiaDao<ImportFile> { // delete all ImportFileId before - ImmutableMap<String, Object> parameters = ImmutableMap.<String, Object>builder().put(ImportFileId.PROPERTY_IMPORT_FILE, entity).build(); - topiaJpaSupport.execute("Delete From " + ImportFileId.class.getName() + " Where " + ImportFileId.PROPERTY_IMPORT_FILE + " = :" + ImportFileId.PROPERTY_IMPORT_FILE, parameters); + { + ImmutableMap<String, Object> parameters = ImmutableMap.<String, Object>builder().put(ImportFileId.PROPERTY_IMPORT_FILE, entity).build(); + topiaJpaSupport.execute("Delete From " + ImportFileId.class.getName() + " Where " + ImportFileId.PROPERTY_IMPORT_FILE + " = :" + ImportFileId.PROPERTY_IMPORT_FILE, parameters); + topiaHibernateSupport.getHibernateSession().flush(); - super.delete(entity); + } + + { + ImmutableMap<String, Object> parameters = ImmutableMap.<String, Object>builder().put(ImportFile.PROPERTY_TOPIA_ID, entity.getTopiaId()).build(); + topiaJpaSupport.execute("Delete From " + ImportFile.class.getName() + " Where " + ImportFile.PROPERTY_TOPIA_ID + " = :" + ImportFile.PROPERTY_TOPIA_ID, parameters); + topiaHibernateSupport.getHibernateSession().flush(); + } +// super.delete(entity); } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogTopiaDao.java index f98a68c..950b025 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogTopiaDao.java @@ -1,15 +1,17 @@ package fr.ifremer.echobase.entities; +import java.util.LinkedList; + public class ImportLogTopiaDao extends AbstractImportLogTopiaDao<ImportLog> { @Override public void delete(ImportLog entity) { ImportFileTopiaDao importFileDao = topiaDaoSupplier.getDao(ImportFile.class, ImportFileTopiaDao.class); - for (ImportFile importFile : entity.getImportFile()) { + for (ImportFile importFile : new LinkedList<>(entity.getImportFile())) { + entity.removeImportFile(importFile); importFileDao.delete(importFile); } - super.delete(entity); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.