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

carnifexx · Jul 23, 2019 · dd1d713 · dd1d713
1 parent b2235c3
commit dd1d713
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/arduino-core/src/cc/arduino/utils/network/FileDownloader.java b/arduino-core/src/cc/arduino/utils/network/FileDownloader.java
@@ -171,6 +171,7 @@ private void downloadFile(boolean noResume) throws InterruptedException {
         final Optional<File> fileFromCache = getFileCached(fileCached);
         if (fileCached.isNotChange() && fileFromCache.isPresent()) {
           // Copy the cached file in the destination file
+          log.info("The file will be taken from the cache {}", fileFromCache);
           FileUtils.copyFile(fileFromCache.get(), outputFile);
         } else {
           openConnectionAndFillTheFile(noResume);

diff --git a/arduino-core/src/cc/arduino/utils/network/FileDownloaderCache.java b/arduino-core/src/cc/arduino/utils/network/FileDownloaderCache.java
@@ -286,17 +286,19 @@ public boolean isNotChange() {
     @JsonIgnore
     public boolean isChange() {
       // Check if the file is expire
-      if (!isExpire()) {
-        log.debug("The file \"{}\" is no expire, the eTag will not be checked. Expire time: {}", localPath,
+      boolean isChange = false;
+      if (isExpire()) {
+        log.debug("The file \"{}\" is expire. Expire time: {}", localPath,
           this.getExpiresTime().format(DateTimeFormatter.ISO_DATE_TIME));
-        return false;
+        isChange = true;
       }
 
-      if (lastETag != null) {
+      if (lastETag != null && !lastETag.equals(eTag)) {
         // If are different means that the file is change
-        return !lastETag.equals(eTag);
+        log.debug("The file \"{}\" is changed last ETag != now Etag ({}!={})", localPath, lastETag, eTag);
+        isChange = true;
       }
-      return true;
+      return isChange;
     }
 
     @JsonIgnore