moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

IMAP: improve bodystructure error handling 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1978 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2012-07-16 22:30:33 +00:00
parent f9fb4307d9
commit ab536ded32
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/java/davmail/imap/ImapConnection.java
View File

@ -48,8 +48,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
/**
* Dav Gateway smtp connection implementation.
* Still alpha code : need to find a way to handle message ids
* Dav Gateway IMAP connection implementation.
*/
public class ImapConnection extends AbstractConnection {
private static final Logger LOGGER = Logger.getLogger(ImapConnection.class);
@ -1068,12 +1067,22 @@ public class ImapConnection extends AbstractConnection {
for (int i = 0; i < multiPart.getCount(); i++) {
MimeBodyPart bodyPart = (MimeBodyPart) multiPart.getBodyPart(i);
Object mimeBody = bodyPart.getContent();
if (mimeBody instanceof MimeMultipart) {
appendBodyStructure(buffer, (MimeMultipart) mimeBody);
} else {
// no multipart, single body
appendBodyStructure(buffer, bodyPart);
try {
Object mimeBody = bodyPart.getContent();
if (mimeBody instanceof MimeMultipart) {
appendBodyStructure(buffer, (MimeMultipart) mimeBody);
} else {
// no multipart, single body
appendBodyStructure(buffer, bodyPart);
}
} catch (UnsupportedEncodingException e) {
LOGGER.warn(e);
// failover: send default bodystructure
buffer.append("(\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL NIL NIL NIL)");
} catch (MessagingException me) {
DavGatewayTray.warn(me);
// failover: send default bodystructure
buffer.append("(\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL NIL NIL NIL)");
}
}
int slashIndex = multiPart.getContentType().indexOf('/');