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

Dav: check checkPublicFolder calls 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1761 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2011-08-05 08:43:13 +00:00
parent e9e16b4567
commit 0b5a22f63f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -482,8 +482,6 @@ public class DavExchangeSession extends ExchangeSession {
@Override @Override
protected void buildSessionInfo(HttpMethod method) throws DavMailException { protected void buildSessionInfo(HttpMethod method) throws DavMailException {
checkPublicFolder(method);
buildMailPath(method); buildMailPath(method);
// get base http mailbox http urls // get base http mailbox http urls
@ -540,6 +538,7 @@ public class DavExchangeSession extends ExchangeSession {
if (mailPath != null) { if (mailPath != null) {
// Exchange 2003 // Exchange 2003
serverVersion = "Exchange2003"; serverVersion = "Exchange2003";
checkPublicFolder(method);
try { try {
buildEmail(method.getURI().getHost()); buildEmail(method.getURI().getHost());
} catch (URIException uriException) { } catch (URIException uriException) {
@ -553,6 +552,9 @@ public class DavExchangeSession extends ExchangeSession {
disableGalLookup = true; disableGalLookup = true;
getEmailAndAliasFromOptions(); getEmailAndAliasFromOptions();
checkPublicFolder(method);
// failover: try to get email through Webdav and Galfind // failover: try to get email through Webdav and Galfind
if (alias == null || email == null) { if (alias == null || email == null) {
try { try {
@ -1301,7 +1303,7 @@ public class DavExchangeSession extends ExchangeSession {
@Override @Override
public byte[] getEventContent() throws IOException { public byte[] getEventContent() throws IOException {
byte[] result = null; 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 to get PR_INTERNET_CONTENT
try { try {
result = getICSFromInternetContentProperty(); result = getICSFromInternetContentProperty();