This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 85e22938f910db4c992e7d150cf6cbb6daf0aa9a Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 14 17:49:41 2017 +0100 fixes #9551 save mimemessage as is --- .../services/service/EmailServiceImpl.java | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 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 57af1060..f2c578b9 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 @@ -1460,21 +1460,13 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe getPersistenceContext().commit(); } - public OriginalEmail originalEmailFromMessage(MimeMessage message, Charset charset) throws MessagingException, IOException { - StringBuilder emailSource = new StringBuilder(); - Enumeration<String> headerLines = message.getAllHeaderLines(); - while (headerLines.hasMoreElements()) { - String headerLine = headerLines.nextElement(); - emailSource.append(headerLine).append("\n"); - } - String originalContent = FaxToMailServiceUtils.getTextFromMessage(message); - emailSource.append("\n").append(originalContent); - - OriginalEmail originalEmail = getPersistenceContext().getOriginalEmailDao().newInstance(); - originalEmail.setContent(emailSource.toString()); - - return originalEmail; - } + public OriginalEmail originalEmailFromMessage(MimeMessage message, Charset charset) throws MessagingException, IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(message.getSize()); + message.writeTo(baos); + OriginalEmail originalEmail = getPersistenceContext().getOriginalEmailDao().newInstance(); + originalEmail.setContent(baos.toString()); + return originalEmail; + } /** * Generate email details as PDF and return it as an printable attachment. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.