diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttribute.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttribute.java index 59bb6a200a..838aacfcbc 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttribute.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttribute.java @@ -83,6 +83,8 @@ public class CorrelationAttribute implements Serializable { @Override 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() + this.getCorrelationType().toString() + this.getCorrelationValue(); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobLogger.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobLogger.java index 122433c56b..dfff014556 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobLogger.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobLogger.java @@ -349,19 +349,6 @@ final class AutoIngestJobLogger { 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. * diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java index bb9e68c610..02e098c1ba 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java @@ -2531,10 +2531,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang if (fileExporter.isEnabled()) { fileExporter.process(manifest.getDeviceId(), dataSource.getContent(), currentJob::isCanceled); jobLogger.logFileExportCompleted(); - } else { - SYS_LOGGER.log(Level.WARNING, "Exporting files not enabled for {0}", manifestPath); - jobLogger.logFileExportDisabled(); - } + } } catch (FileExportException ex) { SYS_LOGGER.log(Level.SEVERE, String.format("Error doing file export for %s", manifestPath), ex); currentJob.setErrorsOccurred(true);