From dcb3626c016b2cd3cf8242d55af04b517427b342 Mon Sep 17 00:00:00 2001 From: Le Zhou <2428499107@qq.com> Date: Mon, 24 Jun 2024 11:46:34 +0800 Subject: [PATCH] Bugfix: check the file load type before judge them as the same file --- .../microsoft/hydralab/common/util/AttachmentService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/microsoft/hydralab/common/util/AttachmentService.java b/common/src/main/java/com/microsoft/hydralab/common/util/AttachmentService.java index bfedf2e52..12a1344c4 100644 --- a/common/src/main/java/com/microsoft/hydralab/common/util/AttachmentService.java +++ b/common/src/main/java/com/microsoft/hydralab/common/util/AttachmentService.java @@ -142,10 +142,9 @@ public List getTestJsonHistory(String packageName, String caseName } public boolean compareFileInfo(StorageFileInfo newFileInfo, StorageFileInfo oldFileInfo) { - if (newFileInfo.getLoadType() == null && oldFileInfo.getLoadType() == null) { - return true; - } else if (newFileInfo.getFileName().equals(oldFileInfo.getFileName()) - && newFileInfo.getLoadType().equals(oldFileInfo.getLoadType()) + if (newFileInfo.getFileName().equals(oldFileInfo.getFileName()) + && ((newFileInfo.getLoadType() == null && oldFileInfo.getLoadType() == null) || + (newFileInfo.getLoadType() != null && newFileInfo.getLoadType().equals(oldFileInfo.getLoadType()))) && newFileInfo.getLoadDir().equals(oldFileInfo.getLoadDir()) && newFileInfo.getBlobContainer().equals(oldFileInfo.getBlobContainer()) && newFileInfo.getFileType().equals(oldFileInfo.getFileType())) {