Commit dd1d713

Mattia Bertorellocmaglie

Mattia Bertorello

authored and

committed

Fix condition when the file is not expire but the lastETag is changed

1 parent b2235c3 commit dd1d713Copy full SHA for dd1d713

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ private void downloadFile(boolean noResume) throws InterruptedException {`
`171`	`171`	`final Optional<File> fileFromCache = getFileCached(fileCached);`
`172`	`172`	`if (fileCached.isNotChange() && fileFromCache.isPresent()) {`
`173`	`173`	`// Copy the cached file in the destination file`
	`174`	`+ log.info("The file will be taken from the cache {}", fileFromCache);`
`174`	`175`	`FileUtils.copyFile(fileFromCache.get(), outputFile);`
`175`	`176`	`} else {`
`176`	`177`	`openConnectionAndFillTheFile(noResume);`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -286,17 +286,19 @@ public boolean isNotChange() {`
`286`	`286`	`@JsonIgnore`
`287`	`287`	`public boolean isChange() {`
`288`	`288`	`// Check if the file is expire`
`289`		`- if (!isExpire()) {`
`290`		`- log.debug("The file \"{}\" is no expire, the eTag will not be checked. Expire time: {}", localPath,`
	`289`	`+ boolean isChange = false;`
	`290`	`+ if (isExpire()) {`
	`291`	`+ log.debug("The file \"{}\" is expire. Expire time: {}", localPath,`
`291`	`292`	`this.getExpiresTime().format(DateTimeFormatter.ISO_DATE_TIME));`
`292`		`- returnfalse;`
	`293`	`+ isChange = true;`
`293`	`294`	`}`
`294`	`295`
`295`		`- if (lastETag != null) {`
	`296`	`+ if (lastETag != null && !lastETag.equals(eTag)) {`
`296`	`297`	`// If are different means that the file is change`
`297`		`- return !lastETag.equals(eTag);`
	`298`	`+ log.debug("The file \"{}\" is changed last ETag != now Etag ({}!={})", localPath, lastETag, eTag);`
	`299`	`+ isChange = true;`
`298`	`300`	`}`
`299`		`- return true;`
	`301`	`+ return isChange;`
`300`	`302`	`}`
`301`	`303`
`302`	`304`	`@JsonIgnore`

Comments

(0)