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

Carddav: avoid NullPointerException on broken contact 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1893 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2012-02-02 21:54:33 +00:00
parent 8f9465ab46
commit 763a0e49ed
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/java/davmail/exchange/ews/EwsExchangeSession.java
View File

@ -1742,21 +1742,20 @@ public class EwsExchangeSession extends ExchangeSession {
EWSMethod.Item item = getItemMethod.getResponseItem();
if (item != null) {
FileAttachment attachment = item.getAttachmentByName("ContactPicture.jpg");
if (attachment != null) {
// get attachment content
GetAttachmentMethod getAttachmentMethod = new GetAttachmentMethod(attachment.attachmentId);
executeMethod(getAttachmentMethod);
contactPhoto = new ContactPhoto();
contactPhoto.content = getAttachmentMethod.getResponseItem().get("Content");
if (attachment.contentType == null) {
contactPhoto.contentType = "image/jpeg";
} else {
contactPhoto.contentType = attachment.contentType;
}
if (attachment == null) {
throw new IOException("Missing contact picture");
}
// get attachment content
GetAttachmentMethod getAttachmentMethod = new GetAttachmentMethod(attachment.attachmentId);
executeMethod(getAttachmentMethod);
contactPhoto = new ContactPhoto();
contactPhoto.content = getAttachmentMethod.getResponseItem().get("Content");
if (attachment.contentType == null) {
contactPhoto.contentType = "image/jpeg";
} else {
contactPhoto.contentType = attachment.contentType;
}
}
return contactPhoto;