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 a2f65d63b2af4997819942d93b27a3211d50f4e9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jun 9 15:59:24 2015 +0200 le protocol a déjà été rétablie, on evite un NPe (refs #7201) --- .../genericformat/GenericFormatImportService.java | 34 ++-------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java index 5cafde1..b66c3ca 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java @@ -137,37 +137,9 @@ public class GenericFormatImportService extends AbstractTuttiService { GenericFormatImportRequest importRequest = createImportRequest(importConfiguration, archive); - try { - - GenericFormatValidateFileResult result = doValidate(importRequest, progressionModel); - generateValidateReport(result, progressionModel); - return result; - - } finally { - - TuttiProtocol oldProtocol = importRequest.getProtocol(); - - if (oldProtocol != null) { - - TuttiProtocol protocol = persistenceService.getProtocol(); - if (!protocol.equals(oldProtocol)) { - - if (log.isInfoEnabled()) { - log.info("Set back old protocol: " + oldProtocol.getId() + " - " + oldProtocol.getName()); - } - - persistenceService.setProtocol(oldProtocol); - - if (log.isInfoEnabled()) { - log.info("Delete temporary protocol: " + protocol.getId() + " - " + protocol.getName()); - } - persistenceService.deleteProtocol(protocol.getId()); - - } - - } - - } + GenericFormatValidateFileResult result = doValidate(importRequest, progressionModel); + generateValidateReport(result, progressionModel); + return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.