From 5b10d50f184f3ec4bd515ded0c915fc20f5f99dc Mon Sep 17 00:00:00 2001 From: mguessan Date: Tue, 4 May 2010 08:35:40 +0000 Subject: [PATCH] Make sure log messages are not localized git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1027 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- .../davmail/exception/DavMailException.java | 17 ++++------------- src/java/davmail/exchange/ExchangeSession.java | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/java/davmail/exception/DavMailException.java b/src/java/davmail/exception/DavMailException.java index 8445b1ff..d97d5a30 100644 --- a/src/java/davmail/exception/DavMailException.java +++ b/src/java/davmail/exception/DavMailException.java @@ -32,21 +32,21 @@ public class DavMailException extends IOException { /** * Create a DavMail exception with the given BundleMessage key and arguments. * - * @param key message key + * @param key message key * @param arguments message values */ public DavMailException(String key, Object... arguments) { - this.message = new BundleMessage(key, arguments); + this.message = new BundleMessage(key, arguments); } /** * Get formatted message * - * @return formatted message + * @return english formatted message */ @Override public String getMessage() { - return message.format(); + return message.formatLog(); } /** @@ -59,15 +59,6 @@ public class DavMailException extends IOException { return message.format(locale); } - /** - * Get formatted message for logging. - * - * @return english formatted message - */ - public String getLogMessage() { - return message.formatLog(); - } - /** * Get internal exception BundleMessage. * diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java index faa8c79b..85b95e28 100644 --- a/src/java/davmail/exchange/ExchangeSession.java +++ b/src/java/davmail/exchange/ExchangeSession.java @@ -242,7 +242,7 @@ public class ExchangeSession { getWellKnownFolders(); } catch (DavMailAuthenticationException exc) { - LOGGER.error(exc.getLogMessage()); + LOGGER.error(exc.getMessage()); throw exc; } catch (UnknownHostException exc) { BundleMessage message = new BundleMessage("EXCEPTION_CONNECT", exc.getClass().getName(), exc.getMessage());