From 1b2c7c720cf01c6f45e1e8f3e305054326d903b2 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 9 Nov 2010 22:27:57 +0000
Subject: [PATCH] Improve error handling: detect redirect to reason=0 as
 session expired

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

diff --git a/src/java/davmail/http/DavGatewayHttpClientFacade.java b/src/java/davmail/http/DavGatewayHttpClientFacade.java
index 8790efcd..fc3898b1 100644
--- a/src/java/davmail/http/DavGatewayHttpClientFacade.java
+++ b/src/java/davmail/http/DavGatewayHttpClientFacade.java
@@ -602,10 +602,6 @@ public final class DavGatewayHttpClientFacade {
         if (followRedirects) {
             String queryString = method.getQueryString();
             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 {
-        if (queryString != null && queryString.contains("reason=2")) {
-            LOGGER.warn("Request failed, session expired  (reason=2) ");
+        if (queryString != null && (queryString.contains("reason=2") || queryString.contains("reason=0"))) {
+            LOGGER.warn("Request failed, session expired");
             throw new DavMailAuthenticationException("EXCEPTION_SESSION_EXPIRED");
         }
     }