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 2da46173847edd16f2e72f3a1418be35cee85e98 Author: jcouteau <couteau@codelutin.com> Date: Thu Sep 27 14:28:26 2018 +0200 Really fix hibernate mess --- .../services/service/EmailServiceImpl.java | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 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 2b3db67d..dfe02f0a 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 @@ -502,6 +502,7 @@ 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,6 +516,19 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe editedFile = currentAttachment.getEditedFile(); } + if (attachment.getGeneratedPDFPages() != null) { + if (currentAttachment.getGeneratedPDFPages() == null) { + pages = attachment.getGeneratedPDFPages(); + } else { + pages = currentAttachment.getGeneratedPDFPages(); + for (GeneratedPDFPage page:attachment.getGeneratedPDFPages()){ + if (!pages.contains(page)){ + pages.add(page); + } + } + } + } + // copy new data attachmentBinder.copyExcluding(attachment, currentAttachment, Attachment.PROPERTY_EMAIL, @@ -531,8 +545,6 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe currentAttachment.setEditedFile(editedFile); currentAttachment.setOriginalFile(originalFile); - // 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 // pour ne pas les charger inutilement @@ -556,6 +568,9 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe } if (!currentAttachment.isPersisted()) { + //Deal here with new generated pdf pages (Mail import case) + currentAttachment.setGeneratedPDFPages(pages); + // persist using cascade currentAttachment = attachmentTopiaDao.create(currentAttachment); currentAttachments.add(currentAttachment); @@ -563,8 +578,6 @@ 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>.