From 641e33cf515712de1f6585e6bf5a37aa394d7e65 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Wed, 24 Jun 2015 11:46:58 -0400 Subject: [PATCH] Fix CollaborationManager.shutdown() bug and ctor exception handling by Case --- Core/src/org/sleuthkit/autopsy/casemodule/Case.java | 1 - .../org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index 9d9cb0dd11..0d5082e1b9 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -306,7 +306,6 @@ public class Case { eventPublisher.openRemoteEventChannel(String.format(EVENT_CHANNEL_NAME, newCase.getTextIndexName())); currentCase.collaborationMonitor = new CollaborationMonitor(); } catch (AutopsyEventException | CollaborationMonitor.CollaborationMonitorException ex) { - currentCase.collaborationMonitor.shutdown(); logger.log(Level.SEVERE, "Failed to setup for collaboration", ex); MessageNotifyUtil.Notify.error(NbBundle.getMessage(Case.class, "Case.CollaborationSetup.FailNotify.Title"), NbBundle.getMessage(Case.class, "Case.CollaborationSetup.FailNotify.ErrMsg")); } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java b/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java index ba09716a92..5626942e83 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java @@ -173,7 +173,7 @@ final class CollaborationMonitor { } Case.removeEventSubscriber(CASE_EVENTS_OF_INTEREST, localTasksManager); - eventPublisher.removeSubscriber(COLLABORATION_MONITOR_EVENT, remoteTasksManager); + IngestManager.getInstance().removeIngestJobEventListener(localTasksManager); if (null != eventPublisher) { eventPublisher.removeSubscriber(COLLABORATION_MONITOR_EVENT, remoteTasksManager);