This is an automated email from the git hooks/post-receive script. New commit to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 42d9dbba9a49a41ab7d08a151dfbecf0b1053ca6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 10 08:56:15 2016 +0200 Tester avant de supprimer lors de la suppression d'un import --- .../removedata/strategy/AbstractRemoveDataStrategy.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java index cee5107..45b9896 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java @@ -108,13 +108,16 @@ public abstract class AbstractRemoveDataStrategy extends EchoBaseServiceSupport String importId = importFileId.getEntityId(); - try { - removeImportData(voyage, importId); - } catch (TopiaException e) { - throw new EchoBaseTechnicalException(e); + boolean exists = persistenceService.isIdExists(importId); + if (exists) { + try { + removeImportData(voyage, importId); + } catch (TopiaException e) { + throw new EchoBaseTechnicalException(e); + } } - incrementOp("ImportLog " + importId + "Removed"); + incrementOp("Import file id:" + importId + " removed."); } @@ -222,7 +225,7 @@ public abstract class AbstractRemoveDataStrategy extends EchoBaseServiceSupport for (String cellId : cellIds) { Optional<Cell> optionalCell = persistenceService.getOptionalCell(cellId); - if (optionalCell.isPresent() ) { + if (optionalCell.isPresent()) { Cell cell = optionalCell.get(); Collection<Result> cellResult = cell.getResult(); // for (Result result : cellResult) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.