You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2011/01/21 09:42:58 UTC

svn commit: r1061684 - in /mina/ftpserver/branches/1.0.x/core/src: main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java test/java/org/apache/ftpserver/clienttests/ListTest.java

Author: ngn
Date: Fri Jan 21 08:42:58 2011
New Revision: 1061684

URL: http://svn.apache.org/viewvc?rev=1061684&view=rev
Log:
OPTS MLST should support any character case of field names (FTPSERVER-393)

Modified:
    mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
    mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java

Modified: mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java?rev=1061684&r1=1061683&r2=1061684&view=diff
==============================================================================
--- mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java (original)
+++ mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java Fri Jan 21 08:42:58 2011
@@ -95,7 +95,7 @@ public class OPTS_MLST extends AbstractC
         for (int i = 0; i < types.length; ++i) {
             boolean bMatch = false;
             for (int j = 0; j < AVAILABLE_TYPES.length; ++j) {
-                if (AVAILABLE_TYPES[j].equals(types[i])) {
+                if (AVAILABLE_TYPES[j].equalsIgnoreCase(types[i])) {
                     bMatch = true;
                     break;
                 }

Modified: mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java?rev=1061684&r1=1061683&r2=1061684&view=diff
==============================================================================
--- mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java (original)
+++ mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java Fri Jan 21 08:42:58 2011
@@ -244,6 +244,21 @@ public class ListTest extends ClientTest
                 + TEST_FILE1.getName(), reply[1]);
     }
 
+    public void testOPTSMLSTCaseInsensitive() throws Exception {
+        TEST_FILE1.createNewFile();
+        
+        assertTrue(FTPReply.isPositiveCompletion(client
+                .sendCommand("OPTS MLST size;Modify")));
+        assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("MLST "
+                + TEST_FILE1.getName())));
+        
+        String[] reply = client.getReplyString().split("\\r\\n");
+        
+        assertEquals("Size=0;Modify="
+                + DateUtils.getFtpDate(TEST_FILE1.lastModified()) + "; "
+                + TEST_FILE1.getName(), reply[1]);
+    }
+
     public void testOPTSMLSTInvalidType() throws Exception {
         TEST_FILE1.createNewFile();