From 32e5ed934205289b70e9c637f450e689e29d2750 Mon Sep 17 00:00:00 2001 From: mguessan Date: Wed, 24 Jun 2009 15:23:36 +0000 Subject: [PATCH] Caldav: Improve error handling on FreeBusy failure git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@601 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- src/java/davmail/exchange/ExchangeSession.java | 3 ++- src/java/davmailmessages.properties | 2 +- src/java/davmailmessages_fr.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java index 284a5577..96fa06ab 100644 --- a/src/java/davmail/exchange/ExchangeSession.java +++ b/src/java/davmail/exchange/ExchangeSession.java @@ -2038,7 +2038,8 @@ public class ExchangeSession { try { int status = httpClient.executeMethod(getMethod); if (status != HttpStatus.SC_OK) { - throw new DavMailException("EXCEPTION_UNABLE_TO_GET_FREEBUSY", getMethod.getPath()); + throw new DavMailException("EXCEPTION_UNABLE_TO_GET_FREEBUSY", getMethod.getPath(), + status, getMethod.getResponseBodyAsString()); } String body = getMethod.getResponseBodyAsString(); int startIndex = body.lastIndexOf(""); diff --git a/src/java/davmailmessages.properties b/src/java/davmailmessages.properties index b5eb180a..ac93830e 100644 --- a/src/java/davmailmessages.properties +++ b/src/java/davmailmessages.properties @@ -28,7 +28,7 @@ EXCEPTION_UNABLE_TO_CREATE_MESSAGE=Unable to create message {0}: {1}{2}{3} EXCEPTION_UNABLE_TO_FIND_USERS={0} Unable to find users from: {1} EXCEPTION_UNABLE_TO_GET_EMAIL=Unable to get user email from: {0} EXCEPTION_UNABLE_TO_GET_FOLDER=Unable to get folder at {0} -EXCEPTION_UNABLE_TO_GET_FREEBUSY=Unable to get free-busy from: {0} +EXCEPTION_UNABLE_TO_GET_FREEBUSY=Unable to get free-busy from: {0} status:{1} message:{2} EXCEPTION_UNABLE_TO_GET_MAIL_FOLDER=Unable to get mail folder EXCEPTION_UNABLE_TO_GET_MAIL_FOLDERS=Unable to get mail folders EXCEPTION_UNABLE_TO_GET_PROPERTY=Unable to get property {0} diff --git a/src/java/davmailmessages_fr.properties b/src/java/davmailmessages_fr.properties index 148ec68e..e7dc4cfd 100644 --- a/src/java/davmailmessages_fr.properties +++ b/src/java/davmailmessages_fr.properties @@ -28,7 +28,7 @@ EXCEPTION_UNABLE_TO_CREATE_MESSAGE=Impossible de cr EXCEPTION_UNABLE_TO_FIND_USERS={0} Impossible de chercher les utilisateurs à l''adresse : {1} EXCEPTION_UNABLE_TO_GET_EMAIL=Impossible d''obtenir l''adresse de messagerie depuis : {0} EXCEPTION_UNABLE_TO_GET_FOLDER=Impossible d''obtenir le dossier {0} -EXCEPTION_UNABLE_TO_GET_FREEBUSY=Impossible d''obtenir les informations de disponibilité depuis : {0} +EXCEPTION_UNABLE_TO_GET_FREEBUSY=Impossible d''obtenir les informations de disponibilité depuis : {0} statut:{1} message:{2} EXCEPTION_UNABLE_TO_GET_MAIL_FOLDER=Impossible d''obtenir le dossier de messagerie EXCEPTION_UNABLE_TO_GET_MAIL_FOLDERS=Impossible d''obtenir les répertoires de messagerie EXCEPTION_UNABLE_TO_GET_PROPERTY=Impossible d''obtenir la propriété {0}