Skip to content
Snippets Groups Projects
Commit b3e61f00 authored by Nicola Fulvio Calabria's avatar Nicola Fulvio Calabria
Browse files

various fixes

parent a51a9bd1
Branches master
No related tags found
No related merge requests found
......@@ -40,8 +40,6 @@ public class CopyController extends AuthenticatedFileController {
} else if (!jobDAO.isJobExisting(jobId)) {
throw new InvalidArgumentException("Job " + jobId + " not found");
}
LOG.debug("copyFiles called from jobId {}", jobId);
......
......@@ -68,7 +68,7 @@ public class GetFileController extends FileController {
throw PermissionDeniedException.forPath(path);
}
File file = new File(fileInfo.getFsPath());
File file = new File(fileInfo.getFilePath());
FileResponseUtil.getFileResponse(response, file, path);
} else {
throw new NodeNotFoundException(path);
......
......@@ -308,7 +308,7 @@ public class ArchiveService {
throw PermissionDeniedException.forPath(fileInfo.getVirtualPath());
}
File file = new File(fileInfo.getFsPath());
File file = new File(fileInfo.getFilePath());
LOG.trace("Adding file " + file.getAbsolutePath() + " to tar archive");
try ( InputStream is = new FileInputStream(file)) {
......
......@@ -206,8 +206,8 @@ public class FileCopyService {
throw PermissionDeniedException.forPath(sourceFileInfo.getVirtualPath());
}
File file = new File(sourceFileInfo.getFsPath());
LOG.trace("Copying file: {} to {}",file.getAbsolutePath(), destinationFileInfo.getFsPath());
File file = new File(sourceFileInfo.getFilePath());
LOG.trace("Copying file: {} to {}",file.getAbsolutePath(), destinationFileInfo.getFilePath());
putFileService.copyLocalFile(sourceFileInfo, destinationFileInfo, remainingQuota);
......
......@@ -53,7 +53,7 @@ public class PutFileService {
public void copyLocalFile(FileInfo sourceFileInfo, FileInfo destinationFileInfo, Long remainingQuota) {
File destinationFile = this.prepareDestination(destinationFileInfo);
File sourceFile = new File(sourceFileInfo.getFsPath());
File sourceFile = new File(sourceFileInfo.getFilePath());
try {
Files.copy(sourceFile.toPath(), destinationFile.toPath());
......
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