From bdfe645aa32435908b723220ed310b166bb14199 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 18 Mar 2014 23:34:52 +0000
Subject: [PATCH] From coverity: more encoding fixes

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

diff --git a/src/java/davmail/exchange/dav/DavExchangeSession.java b/src/java/davmail/exchange/dav/DavExchangeSession.java
index 1cd1bf58..e3ada73c 100644
--- a/src/java/davmail/exchange/dav/DavExchangeSession.java
+++ b/src/java/davmail/exchange/dav/DavExchangeSession.java
@@ -340,6 +340,7 @@ public class DavExchangeSession extends ExchangeSession {
     @Override
     public Map<String, ExchangeSession.Contact> galFind(Condition condition, Set<String> returningAttributes, int sizeLimit) throws IOException {
         Map<String, ExchangeSession.Contact> contacts = new HashMap<String, ExchangeSession.Contact>();
+        //noinspection StatementWithEmptyBody
         if (disableGalFind) {
             // do nothing
         } else if (condition instanceof MultiCondition) {
@@ -520,9 +521,9 @@ public class DavExchangeSession extends ExchangeSession {
         // get user mail URL from html body (multi frame)
         BufferedReader mainPageReader = null;
         try {
-            mainPageReader = new BufferedReader(new InputStreamReader(method.getResponseBodyAsStream()));
-            //noinspection StatementWithEmptyBody
+            mainPageReader = new BufferedReader(new InputStreamReader(method.getResponseBodyAsStream(), "UTF-8"));
             String line;
+            //noinspection StatementWithEmptyBody
             while ((line = mainPageReader.readLine()) != null && !line.toLowerCase().contains(BASE_HREF)) {
             }
             if (line != null) {
@@ -2847,7 +2848,7 @@ public class DavExchangeSession extends ExchangeSession {
                     mimeMessage.writeTo(baos);
                 }
                 if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("Rebuilt message content: " + new String(baos.toByteArray()));
+                    LOGGER.debug("Rebuilt message content: " + new String(baos.toByteArray(), "UTF-8"));
                 }
             } catch (IOException e2) {
                 LOGGER.warn(e2);