Author: ngn
Date: Wed Dec 10 12:36:20 2008
New Revision: 725420
URL: http://svn.apache.org/viewvc?rev=725420&view=rev
Log:
Do not recursively create directories with the MKD command (FTPSERVER-233)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java?rev=725420&r1=725419&r2=725420&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java
Wed Dec 10 12:36:20 2008
@@ -293,7 +293,7 @@
public boolean mkdir() {
boolean retVal = false;
if (isWritable()) {
- retVal = file.mkdirs();
+ retVal = file.mkdir();
}
return retVal;
}
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java?rev=725420&r1=725419&r2=725420&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
Wed Dec 10 12:36:20 2008
@@ -62,15 +62,18 @@
assertEquals(501, client.sendCommand("MKD foo:bar;foo"));
}
+ /**
+ * FTPSERVER-233, we should not recursively create directories
+ */
public void testMkdirDouble() throws Exception {
assertFalse(TEST_DIR1.exists());
assertFalse(TEST_DIR_IN_DIR1.exists());
- assertTrue(FTPReply.isPositiveCompletion(client.mkd(TEST_DIR1.getName()
+
assertFalse(FTPReply.isPositiveCompletion(client.mkd(TEST_DIR1.getName()
+ '/' + TEST_DIR_IN_DIR1.getName())));
- assertTrue(TEST_DIR1.exists());
- assertTrue(TEST_DIR_IN_DIR1.exists());
+ assertFalse(TEST_DIR1.exists());
+ assertFalse(TEST_DIR_IN_DIR1.exists());
}
public void testMkdirDoubleFirstExists() throws Exception {
