codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-28 13:30:00 +00:00
Code Issues Releases Wiki Activity

Removed double-wrapped catches.

Browse Source
This commit is contained in:
U-BASIS\dgrove
2018-03-05 21:55:55 -05:00
parent 6ff3438b08
commit 59f87f77f8
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
+8 -22
View File
@@ -227,15 +227,9 @@ final class EncryptionDetectionFileIngestModule extends FileIngestModuleAdapter
}
if (possiblyEncrypted) {
try {
calculatedEntropy = calculateEntropy(file);
if (calculatedEntropy >= minimumEntropy) {
return true;
}
} catch (ReadContentInputStreamException ex) {
throw new ReadContentInputStreamException("Unable to calculate the entropy.", ex);
} catch (IOException ex) {
throw new IOException("Unable to calculate the entropy.", ex);
calculatedEntropy = calculateEntropy(file);
if (calculatedEntropy >= minimumEntropy) {
return true;
}
}
@@ -289,20 +283,12 @@ final class EncryptionDetectionFileIngestModule extends FileIngestModuleAdapter
return -entropyAccumulator;
} catch (ReadContentInputStreamException ex) {
throw new ReadContentInputStreamException("Exception occurred while trying to read data from ReadContentInputStream.", ex);
} catch (IOException ex) {
throw new IOException("Exception occurred while trying to read data from BufferedInputStream.", ex);
} finally {
try {
if (in != null) {
in.close();
}
if (bin != null) {
bin.close();
}
} catch (IOException ex) {
throw new IOException("Failed to close InputStream.", ex);
if (in != null) {
in.close();
}
if (bin != null) {
bin.close();
}
}
}