Skip to content
Snippets Groups Projects
Commit 875816ea authored by anttil's avatar anttil
Browse files

SSDM-3996: New DSS FS: download of big files doesn't work via CIFS

SVN: 36883
parent 8e1cd00c
No related branches found
No related tags found
No related merge requests found
...@@ -27,6 +27,7 @@ import ch.systemsx.cisd.base.io.IRandomAccessFile; ...@@ -27,6 +27,7 @@ import ch.systemsx.cisd.base.io.IRandomAccessFile;
import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver.FtpFileImpl; import ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver.FtpFileImpl;
import ch.systemsx.cisd.openbis.dss.generic.server.ftp.v3.file.V3FtpFileResponse;
/** /**
* @author Franz-Josef Elmer * @author Franz-Josef Elmer
...@@ -108,6 +109,9 @@ final class CifsFile extends NetworkFile ...@@ -108,6 +109,9 @@ final class CifsFile extends NetworkFile
if (randomAccessFile == null && file instanceof FtpFileImpl) if (randomAccessFile == null && file instanceof FtpFileImpl)
{ {
randomAccessFile = ((FtpFileImpl) file).getFileContent(); randomAccessFile = ((FtpFileImpl) file).getFileContent();
} else if (randomAccessFile == null && file instanceof V3FtpFileResponse)
{
randomAccessFile = ((V3FtpFileResponse) file).getFileContent();
} }
} }
} }
......
...@@ -97,7 +97,7 @@ public class V3FtpPathResolverRegistry implements IFtpPathResolverRegistry ...@@ -97,7 +97,7 @@ public class V3FtpPathResolverRegistry implements IFtpPathResolverRegistry
} }
} catch (Exception e) } catch (Exception e)
{ {
operationLog.warn(e); operationLog.warn("Resolving "+path+" failed", e);
} }
return new V3FtpNonExistingFile(path, "Error when retrieving path"); return new V3FtpNonExistingFile(path, "Error when retrieving path");
} }
......
...@@ -22,6 +22,7 @@ import java.util.List; ...@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.ftpserver.ftplet.FtpFile; import org.apache.ftpserver.ftplet.FtpFile;
import ch.systemsx.cisd.base.io.IRandomAccessFile;
import ch.systemsx.cisd.openbis.common.io.hierarchical_content.HierarchicalContentUtils; import ch.systemsx.cisd.openbis.common.io.hierarchical_content.HierarchicalContentUtils;
import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent;
import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode;
...@@ -40,6 +41,11 @@ public class V3FtpFileResponse extends AbstractFtpFile implements V3FtpFile ...@@ -40,6 +41,11 @@ public class V3FtpFileResponse extends AbstractFtpFile implements V3FtpFile
this.content = content; this.content = content;
} }
public IRandomAccessFile getFileContent()
{
return node.getFileContent();
}
@Override @Override
public boolean isFile() public boolean isFile()
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment