Merge DEV to HEAD

19768 : ALF-2346 - IMAP Image File not extracted from body of email

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-04-21 11:49:59 +00:00
parent 65695eda66
commit 10ee7dc2dc

View File

@@ -32,6 +32,7 @@ import javax.mail.Multipart;
import javax.mail.Part; import javax.mail.Part;
import javax.mail.Session; import javax.mail.Session;
import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimeUtility; import javax.mail.internet.MimeUtility;
import org.alfresco.service.cmr.email.EmailMessage; import org.alfresco.service.cmr.email.EmailMessage;
@@ -227,10 +228,9 @@ public class SubethaEmailMessage implements EmailMessage
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
BodyPart bp = mp.getBodyPart(i); BodyPart bp = mp.getBodyPart(i);
String disposition = bp.getDisposition(); if (bp.getContent() instanceof MimeMultipart)
if (i > 0)
{ {
// It's an attachment. Recurse. // It's multipart. Recurse.
parseMessagePart(bp); parseMessagePart(bp);
} }
else else