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

Implemented suggestions from meeting

parent 29e892ef
No related branches found
No related tags found
No related merge requests found
...@@ -247,7 +247,6 @@ public class FileDAO { ...@@ -247,7 +247,6 @@ public class FileDAO {
public void setBranchLocationId(String rootVosPath, String jobId, int locationId) { public void setBranchLocationId(String rootVosPath, String jobId, int locationId) {
// TODO: validate rootVosPath as a vos_path
String cte = "SELECT n.node_id AS id\n" String cte = "SELECT n.node_id AS id\n"
+ "FROM node n\n" + "FROM node n\n"
+ "JOIN node p ON p.path @> n.path\n" + "JOIN node p ON p.path @> n.path\n"
......
...@@ -126,12 +126,14 @@ public class PutFileService { ...@@ -126,12 +126,14 @@ public class PutFileService {
LOG.warn("Destination file {} size mismatch with source", destinationFile.toPath().toString()); LOG.warn("Destination file {} size mismatch with source", destinationFile.toPath().toString());
} }
if (!sourceFileInfo.getContentType().equals(destinationFileInfo.getContentType())) { if (sourceFileInfo.getContentType() != null &&
!sourceFileInfo.getContentType().equals(destinationFileInfo.getContentType())) {
LOG.warn("Destination file {} content type mismatch with source {} {}", destinationFile.toPath().toString(), LOG.warn("Destination file {} content type mismatch with source {} {}", destinationFile.toPath().toString(),
destinationFileInfo.getContentType(), sourceFileInfo.getContentType()); destinationFileInfo.getContentType(), sourceFileInfo.getContentType());
} }
if (!sourceFileInfo.getContentMd5().equals(md5Checksum)) { if (sourceFileInfo.getContentMd5() != null &&
!sourceFileInfo.getContentMd5().equals(md5Checksum)) {
LOG.warn("Destination file {} md5 mismatch with source {} {}", destinationFile.toPath().toString(), LOG.warn("Destination file {} md5 mismatch with source {} {}", destinationFile.toPath().toString(),
destinationFileInfo.getContentMd5(), sourceFileInfo.getContentMd5() ); destinationFileInfo.getContentMd5(), sourceFileInfo.getContentMd5() );
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment