From 763a0e49eddbb1422654ba81e6668352a90200d4 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Thu, 2 Feb 2012 21:54:33 +0000
Subject: [PATCH] Carddav: avoid NullPointerException on broken contact

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1893 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 .../exchange/ews/EwsExchangeSession.java      | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/java/davmail/exchange/ews/EwsExchangeSession.java b/src/java/davmail/exchange/ews/EwsExchangeSession.java
index ebc24171..eec87792 100644
--- a/src/java/davmail/exchange/ews/EwsExchangeSession.java
+++ b/src/java/davmail/exchange/ews/EwsExchangeSession.java
@@ -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;