BIS-228 / SP-368: Bugfix: Problems with FTP paths without pathinfo db

SVN: 27729

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpFileFactory.java

@@ -16,8 +16,6 @@
 
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
-import java.io.File;
-
 import org.apache.ftpserver.ftplet.FtpFile;
 
 import ch.systemsx.cisd.openbis.common.io.hierarchical_content.IHierarchicalContentNodeFilter;
@@ -66,11 +64,7 @@ public class FtpFileFactory
     {
         try
         {
-            File file = contentNode.getFile();
-            if (file != null)
-            {
-                return file.lastModified();
-            }
+            return contentNode.getLastModified();
         } catch (UnsupportedOperationException uoe)
         {
             // ignore

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContent.java

@@ -72,11 +72,11 @@ public class RemoteHierarchicalContent implements IHierarchicalContent
 
         if (info == null)
         {
-            FileInfoDssDTO[] files =
-                    getRemoteDss().listFilesForDataSet(sessionHolder.getSessionToken(),
-                            location.getLocation().getDataSetCode(), "", false);
-
-            info = convert(files[0]);
+            info = new DataSetPathInfo();
+            info.setDirectory(true);
+            info.setRelativePath("");
+            info.setParent(null);
+            info.setFileName("");
         }
 
         return createNode(info);

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNode.java

@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
@@ -132,7 +133,13 @@ public class RemoteHierarchicalContentNode implements IHierarchicalContentNode
     @Override
     public long getLastModified()
     {
-        return path.getLastModified().getTime();
+        if (path.getLastModified() != null)
+        {
+            return path.getLastModified().getTime();
+        } else
+        {
+            return 0;
+        }
     }
 
     @Override
@@ -179,6 +186,7 @@ public class RemoteHierarchicalContentNode implements IHierarchicalContentNode
                 info.setFileName(file.getPathInDataSet());
                 info.setRelativePath(file.getPathInDataSet());
                 info.setSizeInBytes(file.getFileSize());
+                info.setLastModified(new Date(0L));
                 children.add(new RemoteHierarchicalContentNode(dataSetCode, info, provider,
                         localDss,
                         remoteDss, sessionHolder, sessionWorkspaceRoot, path.getRelativePath()));