From 520a1429bef040ae5738da895c6884cdb98637ef Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Wed, 26 Sep 2012 20:59:53 +0000
Subject: [PATCH] Caldav: do not try to load tasks MIME body

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2040 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 .../exchange/dav/DavExchangeSession.java      | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/java/davmail/exchange/dav/DavExchangeSession.java b/src/java/davmail/exchange/dav/DavExchangeSession.java
index 87c739ac..7639eb86 100644
--- a/src/java/davmail/exchange/dav/DavExchangeSession.java
+++ b/src/java/davmail/exchange/dav/DavExchangeSession.java
@@ -1347,27 +1347,30 @@ public class DavExchangeSession extends ExchangeSession {
         @Override
         public byte[] getEventContent() throws IOException {
             byte[] result = null;
-            LOGGER.debug("Get event subject: " + subject + " href: " + getHref() + " permanentUrl: " + permanentUrl);
-            // try to get PR_INTERNET_CONTENT
-            try {
-                result = getICSFromInternetContentProperty();
-                if (result == null) {
-                    GetMethod method = new GetMethod(encodeAndFixUrl(permanentUrl));
-                    method.setRequestHeader("Content-Type", "text/xml; charset=utf-8");
-                    method.setRequestHeader("Translate", "f");
-                    try {
-                        DavGatewayHttpClientFacade.executeGetMethod(httpClient, method, true);
-                        result = getICS(method.getResponseBodyAsStream());
-                    } finally {
-                        method.releaseConnection();
+            LOGGER.debug("Get event subject: " + subject + " contentclass: "+contentClass+" href: " + getHref() + " permanentUrl: " + permanentUrl);
+            // do not try to load tasks MIME body
+            if (!"urn:content-classes:task".equals(contentClass)) {
+                // try to get PR_INTERNET_CONTENT
+                try {
+                    result = getICSFromInternetContentProperty();
+                    if (result == null) {
+                        GetMethod method = new GetMethod(encodeAndFixUrl(permanentUrl));
+                        method.setRequestHeader("Content-Type", "text/xml; charset=utf-8");
+                        method.setRequestHeader("Translate", "f");
+                        try {
+                            DavGatewayHttpClientFacade.executeGetMethod(httpClient, method, true);
+                            result = getICS(method.getResponseBodyAsStream());
+                        } finally {
+                            method.releaseConnection();
+                        }
                     }
+                } catch (DavException e) {
+                    LOGGER.warn(e.getMessage());
+                } catch (IOException e) {
+                    LOGGER.warn(e.getMessage());
+                } catch (MessagingException e) {
+                    LOGGER.warn(e.getMessage());
                 }
-            } catch (DavException e) {
-                LOGGER.warn(e.getMessage());
-            } catch (IOException e) {
-                LOGGER.warn(e.getMessage());
-            } catch (MessagingException e) {
-                LOGGER.warn(e.getMessage());
             }
 
             // failover: rebuild event from MAPI properties
@@ -2081,6 +2084,7 @@ public class DavExchangeSession extends ExchangeSession {
         ITEM_PROPERTIES.add("instancetype");
         ITEM_PROPERTIES.add("urlcompname");
         ITEM_PROPERTIES.add("subject");
+        ITEM_PROPERTIES.add("contentclass");
     }
 
     protected Set<String> getItemProperties() {