moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 19:22:22 -05:00
Code Issues Releases Wiki Activity

Improve error handling: detect redirect to reason=0 as session expired

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1539 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-11-09 22:27:57 +00:00
parent 90d6648413
commit 1b2c7c720c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/davmail/http/DavGatewayHttpClientFacade.java
View File

@ -602,10 +602,6 @@ public final class DavGatewayHttpClientFacade {
if (followRedirects) { if (followRedirects) {
String queryString = method.getQueryString(); String queryString = method.getQueryString();
checkExpiredSession(queryString); checkExpiredSession(queryString);
if (queryString != null && queryString.contains("reason=2")) {
LOGGER.warn("GET failed, session expired at " + method.getURI() + ": " + method.getResponseBodyAsString());
throw DavGatewayHttpClientFacade.buildHttpException(method);
}
} }
} }
@ -617,8 +613,8 @@ public final class DavGatewayHttpClientFacade {
} }
private static void checkExpiredSession(String queryString) throws DavMailAuthenticationException { private static void checkExpiredSession(String queryString) throws DavMailAuthenticationException {
if (queryString != null && queryString.contains("reason=2")) { if (queryString != null && (queryString.contains("reason=2") || queryString.contains("reason=0"))) {
LOGGER.warn("Request failed, session expired (reason=2) "); LOGGER.warn("Request failed, session expired");
throw new DavMailAuthenticationException("EXCEPTION_SESSION_EXPIRED"); throw new DavMailAuthenticationException("EXCEPTION_SESSION_EXPIRED");
} }
} }