From 28201834f20a213d9553b964d3a1e63401d7e4d1 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dgrove" Date: Tue, 19 Sep 2017 12:40:43 -0400 Subject: [PATCH] Resolved row duplication issue for Running table. --- .../autopsy/experimental/autoingest/AutoIngestJob.java | 2 +- .../autopsy/experimental/autoingest/AutoIngestMonitor.java | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJob.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJob.java index d4986c82c7..3a926326c7 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJob.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJob.java @@ -351,7 +351,7 @@ public final class AutoIngestJob implements Comparable, Serializa @Override public int hashCode() { - int hash = 71 * (Objects.hashCode(this.caseDirectoryPath)); + int hash = 71 * (Objects.hashCode(this.getManifest().getFilePath())); return hash; } diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java index c7a21b82c9..14e5ec9543 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java @@ -139,8 +139,6 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang */ private void handleJobStartedEvent(AutoIngestJobStartedEvent event) { synchronized (jobsLock) { - // DLG: TEST! Remove job from pending queue, if present - // DLG: TEST! Add job to running jobs list jobsSnapshot.removePendingJob(event.getJob()); jobsSnapshot.addOrReplaceRunningJob(event.getJob()); setChanged(); @@ -155,7 +153,6 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang */ private void handleJobStatusEvent(AutoIngestJobStatusEvent event) { synchronized (jobsLock) { - // DLG: TEST! Replace job in running list with job from event jobsSnapshot.addOrReplaceRunningJob(event.getJob()); setChanged(); notifyObservers(null); @@ -169,8 +166,6 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang */ private void handleJobCompletedEvent(AutoIngestJobCompletedEvent event) { synchronized (jobsLock) { - // DLG: TEST! Remove job from event from running list, if present - // DLG: TEST! Add job to completed list jobsSnapshot.removeRunningJob(event.getJob()); jobsSnapshot.addOrReplaceCompletedJob(event.getJob()); setChanged();