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 e1e5ca2032255aafae5c62e3c6873d046d6db4a6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 18 10:19:56 2015 +0200 refs #6973 Amélioration du code de nettoyage après import --- .../importactions/RestoreAfterImportAction.java | 35 ++++++++++++++++------ 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java index 8cbf95c..8f41ae1 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java @@ -32,6 +32,9 @@ import fr.ifremer.tutti.service.genericformat.GenericFormatImportRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.HashSet; +import java.util.Set; + /** * Created on 3/25/15. * @@ -57,15 +60,29 @@ public class RestoreAfterImportAction extends ImportActionSupport { @Override protected void doExecute() { - - GenericFormatImportRequest importRequest = importContext.getImportRequest(); - - try { - rollbackSampleCategoryModel(importRequest); - } finally { - - rollbackProtocol(importRequest); - + + Set<Runnable> actions = new HashSet<>(); + actions.add(new Runnable() { + @Override + public void run() { + rollbackSampleCategoryModel(importContext.getImportRequest()); + } + }); + actions.add(new Runnable() { + @Override + public void run() { + rollbackProtocol(importContext.getImportRequest()); + } + }); + + for (Runnable action : actions) { + try { + action.run(); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Could not execute rollback action", e); + } + } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.