From 1b22263e1edf9aeeb7441f10e6c8bdba95249349 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Thu, 12 Dec 2013 21:40:37 +0000
Subject: [PATCH] Fix authentication failure after session expiration

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2202 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/exchange/ExchangeSessionFactory.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java/davmail/exchange/ExchangeSessionFactory.java b/src/java/davmail/exchange/ExchangeSessionFactory.java
index 1b2be21d..769f1bde 100644
--- a/src/java/davmail/exchange/ExchangeSessionFactory.java
+++ b/src/java/davmail/exchange/ExchangeSessionFactory.java
@@ -54,7 +54,7 @@ public final class ExchangeSessionFactory {
 
         PoolKey(String url, String userName, String password) {
             this.url = url;
-            this.userName = userName;
+            this.userName = convertUserName(userName);
             this.password = password;
         }
 
@@ -100,7 +100,7 @@ public final class ExchangeSessionFactory {
         String result = userName;
         // prepend default windows domain prefix
         String defaultDomain = Settings.getProperty("davmail.defaultDomain");
-        if (userName.indexOf('\\') < 0 && defaultDomain != null) {
+        if (defaultDomain != null && userName.indexOf('\\') < 0 && userName.indexOf('@') < 0) {
             result = defaultDomain + '\\' + userName;
         }
         return result;
@@ -119,7 +119,7 @@ public final class ExchangeSessionFactory {
         ExchangeSession session = null;
         try {
 
-            PoolKey poolKey = new PoolKey(baseUrl, convertUserName(userName), password);
+            PoolKey poolKey = new PoolKey(baseUrl, userName, password);
 
             synchronized (LOCK) {
                 session = POOL_MAP.get(poolKey);