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

CardDav: make getContactPhoto more robust 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1178 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-07-12 23:09:27 +00:00
parent 50d501e5dd
commit a702183d1a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/davmail/exchange/dav/DavExchangeSession.java
View File

@ -43,11 +43,10 @@ import org.apache.jackrabbit.webdav.property.DavProperty;
import org.apache.jackrabbit.webdav.property.DavPropertyNameSet; import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
import org.apache.jackrabbit.webdav.property.DavPropertySet; import org.apache.jackrabbit.webdav.property.DavPropertySet;
import javax.mail.BodyPart;
import javax.mail.MessagingException; import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimePart;
import java.io.*; import java.io.*;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.NoRouteToHostException; import java.net.NoRouteToHostException;
@ -1163,13 +1162,18 @@ public class DavExchangeSession extends ExchangeSession {
inputStream = method.getResponseBodyAsStream(); inputStream = method.getResponseBodyAsStream();
} }
MimeMessage mimeMessage = new MimeMessage(null, inputStream); MimeMessage mimeMessage = new MimeMessage(null, inputStream);
BodyPart photoBodyPart = ((MimeMultipart) mimeMessage.getContent()).getBodyPart(1); MimePart photoBodyPart;
if (mimeMessage.getContent() instanceof MimeMultipart) {
photoBodyPart = (MimePart) ((MimeMultipart) mimeMessage.getContent()).getBodyPart(1);
} else {
photoBodyPart = (MimePart) mimeMessage;
}
contactPhoto = new ContactPhoto(); contactPhoto = new ContactPhoto();
String contentType = photoBodyPart.getContentType(); String contentType = photoBodyPart.getContentType();
contactPhoto.type = contentType.substring(0, contentType.indexOf(';')); contactPhoto.type = contentType.substring(0, contentType.indexOf(';'));
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
InputStream partInputStream = ((MimeBodyPart) photoBodyPart).getInputStream(); InputStream partInputStream = photoBodyPart.getInputStream();
byte[] bytes = new byte[8192]; byte[] bytes = new byte[8192];
int length; int length;
while ((length = partInputStream.read(bytes)) > 0) { while ((length = partInputStream.read(bytes)) > 0) {