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

Merge branch 'release-4.5.0' of github.com:sleuthkit/autopsy into release-4.5.0

Browse Source
This commit is contained in:
Richard Cordovano 2017-09-19 12:43:52 -04:00
commit 6fb8f8d611
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJob.java
View File

@ -465,7 +465,7 @@ public final class AutoIngestJob implements Comparable<AutoIngestJob>, Serializa
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 71 * (Objects.hashCode(this.caseDirectoryPath)); int hash = 71 * (Objects.hashCode(this.getManifest().getFilePath()));
return hash; return hash;
} }

5
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java
View File

@ -139,8 +139,6 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
*/ */
private void handleJobStartedEvent(AutoIngestJobStartedEvent event) { private void handleJobStartedEvent(AutoIngestJobStartedEvent event) {
synchronized (jobsLock) { synchronized (jobsLock) {
// DLG: TEST! Remove job from pending queue, if present
// DLG: TEST! Add job to running jobs list
jobsSnapshot.removePendingJob(event.getJob()); jobsSnapshot.removePendingJob(event.getJob());
jobsSnapshot.addOrReplaceRunningJob(event.getJob()); jobsSnapshot.addOrReplaceRunningJob(event.getJob());
setChanged(); setChanged();
@ -155,7 +153,6 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
*/ */
private void handleJobStatusEvent(AutoIngestJobStatusEvent event) { private void handleJobStatusEvent(AutoIngestJobStatusEvent event) {
synchronized (jobsLock) { synchronized (jobsLock) {
// DLG: TEST! Replace job in running list with job from event
jobsSnapshot.addOrReplaceRunningJob(event.getJob()); jobsSnapshot.addOrReplaceRunningJob(event.getJob());
setChanged(); setChanged();
notifyObservers(null); notifyObservers(null);
@ -169,8 +166,6 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
*/ */
private void handleJobCompletedEvent(AutoIngestJobCompletedEvent event) { private void handleJobCompletedEvent(AutoIngestJobCompletedEvent event) {
synchronized (jobsLock) { 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.removeRunningJob(event.getJob());
jobsSnapshot.addOrReplaceCompletedJob(event.getJob()); jobsSnapshot.addOrReplaceCompletedJob(event.getJob());
setChanged(); setChanged();