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

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
This commit is contained in:
mguessan 2012-09-26 20:59:53 +00:00
parent 12f95e976c
commit 520a1429be
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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() {