Changeset 1229 for extensions/net.sf.basedb.ftp

Timestamp:

Aug 19, 2010, 1:28:52 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #272: Handle CWD . commands correctly

File:

• extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp/BaseFileSystemView.java (modified) (3 diffs)

extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp/BaseFileSystemView.java

@@ -81 +81 @@
     <li>The path starts with a '/', meaning that it is an absolute
       path
+    <li>The path is '.', meaning that we stay in the current
+      directory (this is used by some clients to keep the
+      connection alive)
     <li>All other paths are relative to the current directory.
     </ol>
@@ -106 +109 @@
       changeTo = new Path(currentDir.getAbsolutePath(), Path.Type.DIRECTORY).getParent();
     }
+    else if (path.equals("."))
+    {
+      // Keep changeTo == null
+    }
     else
     {
@@ -118 +125 @@
     try
     {
-      currentDir = new BaseFtpFile(user, Directory.getByPath(dc, changeTo));
+      if (changeTo != null)
+      {
+        currentDir = new BaseFtpFile(user, Directory.getByPath(dc, changeTo));
+      }
       log.debug("Directory changed to: " + currentDir);
       return true;