mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 17:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/release-4.5.0' into 3007-fix-ccn-attributes

Browse Source
This commit is contained in:
millmanorama 2017-09-26 13:22:04 +02:00
commit 2e70a97387
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttribute.java
View File

@ -83,6 +83,8 @@ public class CorrelationAttribute implements Serializable {
@Override @Override
public String toString() { public String toString() {
// NOTE: This string is currently being used in IngestEventsListener to detect if we have already seen
// the value and type pair. Be careful if this method is changed.
String result = this.getID() String result = this.getID()
+ this.getCorrelationType().toString() + this.getCorrelationType().toString()
+ this.getCorrelationValue(); + this.getCorrelationValue();

13
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobLogger.java
View File

@ -349,19 +349,6 @@ final class AutoIngestJobLogger {
log(MessageCategory.WARNING, "Analysis of data source cancelled"); log(MessageCategory.WARNING, "Analysis of data source cancelled");
} }
/**
* Logs that automated file export is not enabled.
*
* @throws AutoIngestJobLoggerException if there is an error writing the log
* message.
* @throws InterruptedException if interrupted while blocked waiting
* to acquire an exclusive lock on the
* log file.
*/
void logFileExportDisabled() throws AutoIngestJobLoggerException, InterruptedException {
log(MessageCategory.WARNING, "Automated file export is not enabled");
}
/** /**
* Logs completion of file export. * Logs completion of file export.
* *

3
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java
View File

@ -2531,9 +2531,6 @@ public final class AutoIngestManager extends Observable implements PropertyChang
if (fileExporter.isEnabled()) { if (fileExporter.isEnabled()) {
fileExporter.process(manifest.getDeviceId(), dataSource.getContent(), currentJob::isCanceled); fileExporter.process(manifest.getDeviceId(), dataSource.getContent(), currentJob::isCanceled);
jobLogger.logFileExportCompleted(); jobLogger.logFileExportCompleted();
} else {
SYS_LOGGER.log(Level.WARNING, "Exporting files not enabled for {0}", manifestPath);
jobLogger.logFileExportDisabled();
} }
} catch (FileExportException ex) { } catch (FileExportException ex) {
SYS_LOGGER.log(Level.SEVERE, String.format("Error doing file export for %s", manifestPath), ex); SYS_LOGGER.log(Level.SEVERE, String.format("Error doing file export for %s", manifestPath), ex);