From 0b5a22f63f643aed0fe98ef40f9fd50a32c3b01e Mon Sep 17 00:00:00 2001 From: mguessan Date: Fri, 5 Aug 2011 08:43:13 +0000 Subject: [PATCH] Dav: check checkPublicFolder calls git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1761 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- src/java/davmail/exchange/dav/DavExchangeSession.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/java/davmail/exchange/dav/DavExchangeSession.java b/src/java/davmail/exchange/dav/DavExchangeSession.java index ac41621d..84dd67be 100644 --- a/src/java/davmail/exchange/dav/DavExchangeSession.java +++ b/src/java/davmail/exchange/dav/DavExchangeSession.java @@ -482,8 +482,6 @@ public class DavExchangeSession extends ExchangeSession { @Override protected void buildSessionInfo(HttpMethod method) throws DavMailException { - checkPublicFolder(method); - buildMailPath(method); // get base http mailbox http urls @@ -540,6 +538,7 @@ public class DavExchangeSession extends ExchangeSession { if (mailPath != null) { // Exchange 2003 serverVersion = "Exchange2003"; + checkPublicFolder(method); try { buildEmail(method.getURI().getHost()); } catch (URIException uriException) { @@ -553,6 +552,9 @@ public class DavExchangeSession extends ExchangeSession { disableGalLookup = true; getEmailAndAliasFromOptions(); + + checkPublicFolder(method); + // failover: try to get email through Webdav and Galfind if (alias == null || email == null) { try { @@ -1301,7 +1303,7 @@ public class DavExchangeSession extends ExchangeSession { @Override public byte[] getEventContent() throws IOException { byte[] result = null; - LOGGER.debug("Get event subject: " + subject + "href: "+getHref()+" permanentUrl: " + permanentUrl); + LOGGER.debug("Get event subject: " + subject + " href: "+getHref()+" permanentUrl: " + permanentUrl); // try to get PR_INTERNET_CONTENT try { result = getICSFromInternetContentProperty();