Terminate reply with \r\n

git-svn-id: svn://svn.code.sf.net/p/mockftpserver/code@96 531de8e6-9941-0410-b38b-9a92acbe0330

2 files changed, 6 insertions, 3 deletions

diff --git a/branches/1.x_Branch/src/main/java/org/mockftpserver/core/session/DefaultSession.java b/branches/1.x_Branch/src/main/java/org/mockftpserver/core/session/DefaultSession.java
index ce45f3b..d6a55e7 100644
--- a/branches/1.x_Branch/src/main/java/org/mockftpserver/core/session/DefaultSession.java
+++ b/branches/1.x_Branch/src/main/java/org/mockftpserver/core/session/DefaultSession.java
@@ -56,6 +56,7 @@ import org.mockftpserver.core.util.AssertFailedException;
 public class DefaultSession implements Session {

 

     private static final Logger LOG = Logger.getLogger(DefaultSession.class);

+    private static final String END_OF_LINE = "\r\n";

     static final int DEFAULT_CLIENT_DATA_PORT = 21;

     

     SocketFactory socketFactory = new DefaultSocketFactory();

@@ -219,7 +220,7 @@ public class DefaultSession implements Session {
      */

     private void writeLineToControlConnection(String line) {

         try {

-            controlConnectionWriter.write(line + "\n");

+            controlConnectionWriter.write(line + END_OF_LINE);

             controlConnectionWriter.flush();

         }

         catch (IOException e) {

diff --git a/branches/1.x_Branch/src/test/java/org/mockftpserver/core/session/DefaultSession_RunTest.java b/branches/1.x_Branch/src/test/java/org/mockftpserver/core/session/DefaultSession_RunTest.java
index 9cc8eb1..d704af0 100644
--- a/branches/1.x_Branch/src/test/java/org/mockftpserver/core/session/DefaultSession_RunTest.java
+++ b/branches/1.x_Branch/src/test/java/org/mockftpserver/core/session/DefaultSession_RunTest.java
@@ -238,8 +238,10 @@ public final class DefaultSession_RunTest extends AbstractTest {
 

         assertEquals("commandHandled", true, commandHandled);

 

-        String output = outputStream.toString().trim();

-        LOG.info("output=[" + output + "]");

+        String output = outputStream.toString();

+        LOG.info("output=[" + output.trim() + "]");

+        assertTrue("line ends with \\r\\n", 

+                output.charAt(output.length()-2) == '\r' && output.charAt(output.length()-1) == '\n');

         assertTrue("output: expected [" + expectedOutput + "]", output.indexOf(expectedOutput) != -1);

     }