Author: dcosse Date: 2014-06-26 16:22:49 +0200 (Thu, 26 Jun 2014) New Revision: 269 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/269 Log: refs #4666 r?\195?\169ception des PJs fonctionnel Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-26 12:51:38 UTC (rev 268) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-26 14:22:49 UTC (rev 269) @@ -303,7 +303,6 @@ if (mailFolder != null) { email.setMailFolder(mailFolder); modifiedProperties.add(Email.PROPERTY_MAIL_FOLDER); - break; } } @@ -380,7 +379,7 @@ int multiPartCount = mimeMultipart.getCount(); for (int j = 0; j < multiPartCount; j++) { - BodyPart bp = mimeMultipart.getBodyPart(j); + MimeBodyPart bp = (MimeBodyPart) mimeMultipart.getBodyPart(j); Charset charset = getCharset(bp); // if it is a text part, the,n this is the email content @@ -403,14 +402,18 @@ // parse Content-ID (content identifier in html mail content) String[] headers = bp.getHeader("Content-ID"); - if (headers == null) { - break; + String contentID = null; + if (headers != null) { + contentID = headers[0]; + contentID = contentID.replaceFirst("^<(.*)>$", "$1"); } - String contentID = headers[0]; + // remove the guillemets between the id - contentID = contentID.replaceFirst("^<(.*)>$", "$1"); - - if (fileName == null) { + + + if (fileName == null && contentID == null) { + break; + } else if (fileName == null) { fileName = contentID; }