codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-10-05 00:36:16 +00:00
Code Issues Releases Wiki Activity

Final search now blocks until that thread is done.

Browse Source
This commit is contained in:
Samuel H. Kenyon
2014-04-01 11:54:45 -04:00
parent ed9c83acf5
commit ce2d42542b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
+8 -1
View File
@@ -39,6 +39,7 @@ import org.netbeans.api.progress.aggregate.AggregateProgressFactory;
import org.netbeans.api.progress.aggregate.AggregateProgressHandle;
import org.netbeans.api.progress.aggregate.ProgressContributor;
import org.openide.util.Cancellable;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.coreutils.EscapeUtil;
import org.sleuthkit.autopsy.coreutils.Logger;
@@ -175,7 +176,13 @@ public final class SearchRunner {
if (!job.getKeywordListNames().isEmpty()) {
SearchRunner.Searcher finalSearcher = new SearchRunner.Searcher(job, true);
finalSearcher.execute();
}
try {
// block until the search is complete
finalSearcher.get();
} catch (InterruptedException | ExecutionException ex) {
logger.log(Level.WARNING, "Job {1} final search thread failed: {2}", new Object[]{job.getJobId(), ex});
}
}
}