This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 98b67ad1b9221b59c8fc89b76dfee1ede5631f2c Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 26 17:42:50 2018 +0200 Fix Hibernate exception --- .../faxtomail/services/service/EmailServiceImpl.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 4385b3be..8900bcc8 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -492,7 +492,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe AttachmentFileTopiaDao attachementFileTopiaDao = getPersistenceContext().getAttachmentFileDao(); for (Attachment attachment : attachments) { - // get session attachment from id + // get session attachment from id -> currentAttachment = attachment stored in db Attachment currentAttachment; if (StringUtils.isNotBlank(attachment.getTopiaId())) { currentAttachment = currentAttachmentIndex.remove(attachment.getTopiaId()); @@ -502,7 +502,6 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe AttachmentFile originalFile = null; AttachmentFile editedFile = null; - Collection<GeneratedPDFPage> pages = null; // dans tout les cas, les pieces jointes courantes de l'attachment prévalent // sur celles en base if (attachment.getOriginalFile() != null) { @@ -515,11 +514,6 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe } else { editedFile = currentAttachment.getEditedFile(); } - if (attachment.getGeneratedPDFPages() != null) { - pages = attachment.getGeneratedPDFPages(); - } else { - pages = currentAttachment.getGeneratedPDFPages(); - } // copy new data attachmentBinder.copyExcluding(attachment, currentAttachment, @@ -536,7 +530,8 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe currentAttachment.setEmail(email); currentAttachment.setEditedFile(editedFile); currentAttachment.setOriginalFile(originalFile); - currentAttachment.setGeneratedPDFPages(pages); + + // On ignore les GeneratedPDFPages car elles ne sont jamais modifiées dans l'UI. // ici les pieces jointes peuvent être sauvegardées sans que les pièces jointes // soit présentes dans les entités car l'ui ne les a pas copiées @@ -568,6 +563,8 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe } else { attachmentTopiaDao.update(currentAttachment); } + + getPersistenceContext().getHibernateSupport().getHibernateSession().flush(); } if (!newFiles.isEmpty()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.