From 921070b3d153cb7daf1927cee4bf32a66fd465ec Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Thu, 14 Jul 2011 22:15:54 +0000
Subject: [PATCH] Fix DoubleDotInputStream

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1734 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/exchange/DoubleDotInputStream.java     | 7 ++-----
 src/test/davmail/exchange/TestDoubleDotInputStream.java | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/java/davmail/exchange/DoubleDotInputStream.java b/src/java/davmail/exchange/DoubleDotInputStream.java
index 7efb554f..f8c85f2a 100644
--- a/src/java/davmail/exchange/DoubleDotInputStream.java
+++ b/src/java/davmail/exchange/DoubleDotInputStream.java
@@ -67,11 +67,8 @@ public class DoubleDotInputStream extends PushbackInputStream {
                         }
                         // \r\n..
                     } else if (buffer[index] == '.') {
-                        // \r\n..\r
-                        if ((readNextByte()) == '\r') {
-                            // replace double dot
-                            buffer[--index] = '\r';
-                        }
+                        // replace double dot
+                        index--;
                     }
                 }
             }
diff --git a/src/test/davmail/exchange/TestDoubleDotInputStream.java b/src/test/davmail/exchange/TestDoubleDotInputStream.java
index 91c881b9..04025a1b 100644
--- a/src/test/davmail/exchange/TestDoubleDotInputStream.java
+++ b/src/test/davmail/exchange/TestDoubleDotInputStream.java
@@ -101,7 +101,7 @@ public class TestDoubleDotInputStream extends TestCase {
 
     public void testAnotherTest() throws IOException {
         String value = "foo\r\n..bar";
-        assertEquals(value, doubleDotRead(value));
+        assertEquals(value.replaceAll("\\.\\.", "."), doubleDotRead(value));
     }
 
 }