moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-02-28 17:31:52 -05:00
Code Issues Releases Wiki Activity

Failover for misconfigured Exchange server, replace host name in url

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1560 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-11-25 22:32:38 +00:00
parent 5f958efb1f
commit 3bc182ff08
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.io.*;
import java.net.URL;
import java.net.UnknownHostException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@ -2414,6 +2415,9 @@ public class DavExchangeSession extends ExchangeSession {
return false;
}
// wrong hostname fix flag
protected boolean restoreHostName = false;
/**
* @inheritDoc
*/
@ -2423,10 +2427,16 @@ public class DavExchangeSession extends ExchangeSession {
InputStream contentInputStream;
try {
try {
contentInputStream = getContentInputStream(message.messageUrl);
try {
contentInputStream = getContentInputStream(message.messageUrl, restoreHostName);
} catch (UnknownHostException e) {
// failover for misconfigured Exchange server, replace host name in url
contentInputStream = getContentInputStream(message.messageUrl, restoreHostName);
restoreHostName = true;
}
} catch (HttpNotFoundException e) {
LOGGER.debug("Message not found at: " + message.messageUrl + ", retrying with permanenturl");
contentInputStream = getContentInputStream(message.permanentUrl);
contentInputStream = getContentInputStream(message.permanentUrl, restoreHostName);
}
try {
@ -2513,8 +2523,16 @@ public class DavExchangeSession extends ExchangeSession {
return baos.toByteArray();
}
protected InputStream getContentInputStream(String url) throws IOException {
final GetMethod method = new GetMethod(URIUtil.encodePath(url));
protected InputStream getContentInputStream(String url, boolean fixHostName) throws IOException {
String actualUrl = URIUtil.encodePath(url);
if (fixHostName) {
String targetPath = new URI(actualUrl, true).getEscapedPath();
URI targetUri = new URI(httpClient.getHostConfiguration().getHostURL(), true);
targetUri.setEscapedPath(targetPath);
actualUrl = targetUri.getEscapedURI();
}
final GetMethod method = new GetMethod(actualUrl);
method.setRequestHeader("Content-Type", "text/xml; charset=utf-8");
method.setRequestHeader("Translate", "f");
method.setRequestHeader("Accept-Encoding", "gzip");