moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-01-05 18:58:02 -05:00
Code Issues Releases Wiki Activity

Fix NullPointerException on server unavailable

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2156 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2013-07-17 22:11:30 +00:00
parent efdec3e3c5
commit 284fe9bce0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/davmail/exchange/ExchangeSession.java
View File

@ -530,15 +530,15 @@ public abstract class ExchangeSession {
// try to get new method from script based redirection
logonMethod = buildLogonMethod(httpClient, logonMethod);
if (otpPreAuthFound && otpPreAuthRetries < MAX_OTP_RETRIES) {
// A OTP pre-auth page has been found, it is needed to restart the login process.
// This applies to both the case the user entered a good OTP code (the usual login process
// takes place) and the case the user entered a wrong OTP code (another code will be asked to him).
// The user has up to MAX_OTP_RETRIES chances to input a valid OTP key.
return postLogonMethod(httpClient, logonMethod, userName, password);
}
if (logonMethod != null) {
if (otpPreAuthFound && otpPreAuthRetries < MAX_OTP_RETRIES) {
// A OTP pre-auth page has been found, it is needed to restart the login process.
// This applies to both the case the user entered a good OTP code (the usual login process
// takes place) and the case the user entered a wrong OTP code (another code will be asked to him).
// The user has up to MAX_OTP_RETRIES chances to input a valid OTP key.
return postLogonMethod(httpClient, logonMethod, userName, password);
}
// if logonMethod is not null, try to follow redirection
logonMethod = DavGatewayHttpClientFacade.executeFollowRedirects(httpClient, logonMethod);
checkFormLoginQueryString(logonMethod);