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

fixes based on review

Browse Source
This commit is contained in:
Greg DiCristofaro 2020-04-16 14:20:31 -04:00
parent 0e2520d5c0
commit 7def5251e0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -61,7 +61,6 @@ import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import org.openide.util.Exceptions;
import org.openide.util.Lookup; import org.openide.util.Lookup;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages; import org.openide.util.NbBundle.Messages;
@ -160,7 +159,7 @@ public class Case {
private static final AutopsyEventPublisher eventPublisher = new AutopsyEventPublisher(); private static final AutopsyEventPublisher eventPublisher = new AutopsyEventPublisher();
private static final Object caseActionSerializationLock = new Object(); private static final Object caseActionSerializationLock = new Object();
private static Future<?> backgroundOpenFileSystemsFuture = null; private static Future<?> backgroundOpenFileSystemsFuture = null;
private static final ExecutorService startIngestJobsExecutor private static final ExecutorService backgroundOpenFileSystemsExecutor
= Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("Case-open-file-systems-%d").build()); = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("Case-open-file-systems-%d").build());
private static volatile Frame mainFrame; private static volatile Frame mainFrame;
private static volatile Case currentCase; private static volatile Case currentCase;
@ -2007,8 +2006,8 @@ public class Case {
/** /**
* Starts a background task that reads a sector from each file system of * Starts a background task that reads a sector from each file system of
* each image of a case to do an eager open of the filesystems in case. If * each image of a case to do an eager open of the filesystems in the case.
* this method is called before another background file system read has * If this method is called before another background file system read has
* finished the earlier one will be cancelled. * finished the earlier one will be cancelled.
* *
* @throws CaseActionCancelledException Exception thrown if task is * @throws CaseActionCancelledException Exception thrown if task is
@ -2018,13 +2017,13 @@ public class Case {
"# {0} - case", "Case.openFileSystems.retrievingImages=Retrieving images for case: {0}...", "# {0} - case", "Case.openFileSystems.retrievingImages=Retrieving images for case: {0}...",
"# {0} - image", "Case.openFileSystems.openingImage=Opening all filesystems for image: {0}..." "# {0} - image", "Case.openFileSystems.openingImage=Opening all filesystems for image: {0}..."
}) })
private void openFileSystemsInBackground() throws CaseActionCancelledException { private void openFileSystemsInBackground() {
if (backgroundOpenFileSystemsFuture != null && !backgroundOpenFileSystemsFuture.isDone()) { if (backgroundOpenFileSystemsFuture != null && !backgroundOpenFileSystemsFuture.isDone()) {
backgroundOpenFileSystemsFuture.cancel(true); backgroundOpenFileSystemsFuture.cancel(true);
} }
BackgroundOpenFileSystemsTask backgroundTask = new BackgroundOpenFileSystemsTask(this.caseDb, new LoggingProgressIndicator()); BackgroundOpenFileSystemsTask backgroundTask = new BackgroundOpenFileSystemsTask(this.caseDb, new LoggingProgressIndicator());
backgroundOpenFileSystemsFuture = startIngestJobsExecutor.submit(backgroundTask); backgroundOpenFileSystemsFuture = backgroundOpenFileSystemsExecutor.submit(backgroundTask);
} }
/** /**