| commit | a8424850ec94ce01ede4c6ac3761bee1104a7535 | [log] [tgz] |
|---|---|---|
| author | Niklas Gustavsson <ngn@apache.org> | Thu Feb 18 21:49:13 2010 +0000 |
| committer | Niklas Gustavsson <ngn@apache.org> | Thu Feb 18 21:49:13 2010 +0000 |
| tree | 300bf4d1008eac4e1a4619476dd75ca72ba8669f | |
| parent | a3e3e86ea716f4392ad14eb606c31f342902bce2 [diff] |
Fixing bug where we did not correctly handle multiline replies with lines starting with numbers (FTPSERVER-347) git-svn-id: https://svn.apache.org/repos/asf/mina/ftpserver/trunk@911609 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/test/java/org/apache/ftpserver/impl/DefaultFtpReplyTest.java b/core/src/test/java/org/apache/ftpserver/impl/DefaultFtpReplyTest.java index 07c54d3..f07ddbc 100644 --- a/core/src/test/java/org/apache/ftpserver/impl/DefaultFtpReplyTest.java +++ b/core/src/test/java/org/apache/ftpserver/impl/DefaultFtpReplyTest.java
@@ -72,4 +72,11 @@ assertEquals("123-foo\r\n bar\r\n123 baz\r\n", response.toString()); } + + public void testMultipleLinesToStringNumberFirst() { + DefaultFtpReply response = new DefaultFtpReply(123, "foo\n234bar\nbaz"); + + assertEquals("123-foo\r\n 234bar\r\n123 baz\r\n", response.toString()); + } + }
diff --git a/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java b/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java index 0ae5ce3..d1eab0f 100644 --- a/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java +++ b/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java
@@ -121,6 +121,9 @@ sb.append(" "); } + if(line.length() > 0 && Character.isDigit(line.charAt(0))) { + sb.append(" "); + } sb.append(line); sb.append(CRLF); }