This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit e3a504b6aade8bb9944e14967152527036c502b3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 18 10:18:25 2015 +0200 refs #6973 bien deselectionne le protocol avant sa suppression + supprimer ancien protocol, avant de repositionner un eventuel protocol selectionne avant import --- .../genericformat/importactions/RestoreAfterValidateAction.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java index 32fc547..ff8205c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java @@ -80,12 +80,14 @@ public class RestoreAfterValidateAction extends ImportActionSupport { actions.add(new Runnable() { @Override public void run() { + // clean imported protocol rollbackProtocol(); } }); actions.add(new Runnable() { @Override public void run() { + // push back if any previous protocol rollbackPreviousProtocol(importContext.getImportRequest()); } }); @@ -159,6 +161,7 @@ public class RestoreAfterValidateAction extends ImportActionSupport { if (log.isInfoEnabled()) { log.info("Delete imported protocol: " + importedProtocol); } + persistenceService.setProtocol(null); persistenceService.deleteProtocol(importedProtocol.getId()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.