Merge branch 'develop' of github.com:sleuthkit/autopsy into 7624-consistentContentViewers

This commit is contained in:
Greg DiCristofaro 2021-06-08 09:13:46 -04:00
commit a8409593f2

View File

@ -211,6 +211,11 @@ final class ExtractZoneIdentifier extends Extract {
* @return true if possibleDownloadFile corresponds to zoneFile, false otherwise. * @return true if possibleDownloadFile corresponds to zoneFile, false otherwise.
*/ */
private boolean isZoneFileMatch(AbstractFile zoneFile, String expectedDownloadFileName, AbstractFile possibleDownloadFile) { private boolean isZoneFileMatch(AbstractFile zoneFile, String expectedDownloadFileName, AbstractFile possibleDownloadFile) {
if (zoneFile == null || possibleDownloadFile == null || expectedDownloadFileName == null) {
return false;
}
if (zoneFile.getMetaAddr() != possibleDownloadFile.getMetaAddr()) { if (zoneFile.getMetaAddr() != possibleDownloadFile.getMetaAddr()) {
return false; return false;
} }