Author: kmorin Date: 2014-11-19 11:14:17 +0000 (Wed, 19 Nov 2014) New Revision: 693 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/693 Log: fix erreur sauvegarde email Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-18 15:21:43 UTC (rev 692) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-19 11:14:17 UTC (rev 693) @@ -412,7 +412,7 @@ AttachmentTopiaDao attachmentTopiaDao = getPersistenceContext().getAttachmentDao(); HistoryTopiaDao historyTopiaDao = getPersistenceContext().getHistoryDao(); - List<Attachment> currentAttachments = attachmentTopiaDao.forEmailEquals(email).findAll(); + List<Attachment> currentAttachments = attachmentTopiaDao.forTopiaIdIn(email.getAttachmentTopiaIds()).findAll(); if (currentAttachments == null) { currentAttachments = new ArrayList<>(); } @@ -1663,21 +1663,23 @@ // email.addHistory(history); - try { - Attachment contentAttachment = convertTextToPdf(email.getOriginalEmail(), - t("faxtomail.email.content.attachment.plainfileName")); + if (StringUtils.isNotBlank(email.getOriginalEmail())) { + try { + Attachment contentAttachment = convertTextToPdf(email.getOriginalEmail(), + t("faxtomail.email.content.attachment.plainfileName")); - AttachmentFile contentAttachmentFile = contentAttachment.getOriginalFile(); - contentAttachmentFile.setTopiaId(getTopiaId(AttachmentFile.class, contentAttachmentFile)); - statelessSession.insert(contentAttachmentFile); + AttachmentFile contentAttachmentFile = contentAttachment.getOriginalFile(); + contentAttachmentFile.setTopiaId(getTopiaId(AttachmentFile.class, contentAttachmentFile)); + statelessSession.insert(contentAttachmentFile); - contentAttachment.setEmail(email); - contentAttachment.setTopiaId(getTopiaId(Attachment.class, contentAttachment)); - statelessSession.insert(contentAttachment); + contentAttachment.setEmail(email); + contentAttachment.setTopiaId(getTopiaId(Attachment.class, contentAttachment)); + statelessSession.insert(contentAttachment); - } catch (IOException | DocumentException e) { - if (log.isErrorEnabled()) { - log.error("error while creating email content attachment", e); + } catch (IOException | DocumentException e) { + if (log.isErrorEnabled()) { + log.error("error while creating email content attachment", e); + } } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-11-18 15:21:43 UTC (rev 692) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-11-19 11:14:17 UTC (rev 693) @@ -30,16 +30,12 @@ import java.awt.event.ContainerEvent; import java.awt.event.ContainerListener; import java.awt.event.MouseEvent; -import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.io.RandomAccessFile; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; import java.util.Date; import java.util.List; @@ -51,7 +47,6 @@ import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jpedal.PdfDecoder;