1
0
mirror of https://github.com/moparisthebest/davmail synced 2025-02-28 09:21:49 -05:00

Fix last open session failover: do not append @hostname when alias contains @

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@892 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-12-21 15:02:16 +00:00
parent 67ed96545f
commit 5df74c320b
3 changed files with 9 additions and 5 deletions

View File

@ -2903,10 +2903,12 @@ public class ExchangeSession {
}
if (alias != null) {
buffer.append(alias);
buffer.append('@');
int dotIndex = hostName.indexOf('.');
if (dotIndex >= 0) {
buffer.append(hostName.substring(dotIndex + 1));
if (alias.indexOf('@') < 0) {
buffer.append('@');
int dotIndex = hostName.indexOf('.');
if (dotIndex >= 0) {
buffer.append(hostName.substring(dotIndex + 1));
}
}
}
email = buffer.toString();

View File

@ -7,6 +7,7 @@ EXCEPTION_DAVMAIL_CONFIGURATION=DavMail configuration exception:\n{0}
EXCEPTION_END_OF_STREAM=End of stream reached reading content
EXCEPTION_EVENT_NOT_FOUND=Calendar event not found
EXCEPTION_EXCHANGE_LOGIN_FAILED=Exchange login exception: {0}
EXCEPTION_SESSION_EXPIRED=Exchange session expired
EXCEPTION_INVALID_CALDAV_REQUEST=Invalid Caldav request: {0}
EXCEPTION_INVALID_CONTENT_LENGTH=Invalid content length: {0}
EXCEPTION_INVALID_CONTENT_TYPE=Invalid content type: {0}

View File

@ -230,4 +230,5 @@ LOG_SUBFOLDER_ACCESS_FORBIDDEN=Acc
LOG_FOLDER_ACCESS_FORBIDDEN=Accès interdit au dossier {0}
LOG_FOLDER_NOT_FOUND=Dossier {0} introuvable
LOG_FOLDER_ACCESS_ERROR=Erreur lors de l''accès au dossier {0} : {1}
UI_OTP_PASSWORD_PROMPT=Mot de passe du jeton :
UI_OTP_PASSWORD_PROMPT=Mot de passe du jeton :
EXCEPTION_SESSION_EXPIRED=Session Exchange expirée