From 443a3df55bd87f956dd6b6ebda7cd52fa4b1a07c Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Mon, 6 Feb 2012 08:34:46 +0000
Subject: [PATCH] EWS: improve failover on error retrieving MimeContent

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

diff --git a/src/java/davmail/exchange/ews/EwsExchangeSession.java b/src/java/davmail/exchange/ews/EwsExchangeSession.java
index eec87792..37fb0113 100644
--- a/src/java/davmail/exchange/ews/EwsExchangeSession.java
+++ b/src/java/davmail/exchange/ews/EwsExchangeSession.java
@@ -503,9 +503,14 @@ public class EwsExchangeSession extends ExchangeSession {
     protected byte[] getContent(ItemId itemId) throws IOException {
         GetItemMethod getItemMethod = new GetItemMethod(BaseShape.ID_ONLY, itemId, true);
         executeMethod(getItemMethod);
-        byte[] mimeContent = getItemMethod.getMimeContent();
+        byte[] mimeContent = null;
+        try {
+            mimeContent = getItemMethod.getMimeContent();
+        } catch (EWSException e) {
+            LOGGER.warn("GetItem with MimeContent failed: "+e.getMessage());
+        }
         if (mimeContent == null) {
-            LOGGER.warn("GetItem returned null MimeContent, trying to rebuild from properties");
+            LOGGER.warn("MimeContent not available, trying to rebuild from properties");
             try {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 getItemMethod = new GetItemMethod(BaseShape.ID_ONLY, itemId, false);