From 429e3bcb542fdeee08dd404771fb5e7de9e38e0c Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Fri, 8 Jan 2021 17:45:51 -0500
Subject: [PATCH] 7084 cancel when interupted exception thrown

---
 .../org/sleuthkit/autopsy/discovery/ui/ArtifactsWorker.java   | 1 +
 .../sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.java | 1 -
 .../sleuthkit/autopsy/discovery/ui/MiniTimelineWorker.java    | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsWorker.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsWorker.java
index faf23e8b04..1202f20647 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsWorker.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsWorker.java
@@ -61,6 +61,7 @@ class ArtifactsWorker extends SwingWorker<List<BlackboardArtifact>, Void> {
                 return domainSearch.getArtifacts(new DomainSearchArtifactsRequest(Case.getCurrentCase().getSleuthkitCase(), domain, artifactType));
             } catch (DiscoveryException ex) {
                 if (ex.getCause() instanceof InterruptedException) {
+                      this.cancel(true);
                     //ignore the exception as it was cancelled while the cache was performing its get and we support cancellation
                 } else {
                     throw ex;
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.java
index 8f9fd45fcb..901d8ba60a 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.java
@@ -347,7 +347,6 @@ public final class DiscoveryTopComponent extends TopComponent {
                 domainDetailsPanel.configureArtifactTabs(selectedDomainTabName);
                 detailsPanel = domainDetailsPanel;
             } else {
-                FileDetailsPanel fileDetailsPanel = new FileDetailsPanel();
                 detailsPanel = new FileDetailsPanel();
             }
             rightSplitPane.setBottomComponent(detailsPanel);
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelineWorker.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelineWorker.java
index b83c5b0b1a..e9122256ba 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelineWorker.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelineWorker.java
@@ -57,10 +57,10 @@ class MiniTimelineWorker extends SwingWorker<List<MiniTimelineResult>, Void> {
             DomainSearch domainSearch = new DomainSearch();
             try {
                 results.addAll(domainSearch.getAllArtifactsForDomain(Case.getCurrentCase().getSleuthkitCase(), domain));
-
             } catch (DiscoveryException ex) {
                 if (ex.getCause() instanceof InterruptedException) {
-                   //ignore the exception as it was cancelled while the cache was performing its get and we support cancellation
+                    this.cancel(true);
+                    //ignore the exception as it was cancelled while the cache was performing its get and we support cancellation
                 } else {
                     throw ex;
                 }