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

Fix CollaborationManager.shutdown() bug and ctor exception handling by Case

Browse Source
This commit is contained in:
Richard Cordovano 2015-06-24 11:46:58 -04:00
parent f196a6c05c
commit 641e33cf51
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,7 +306,6 @@ public class Case {
eventPublisher.openRemoteEventChannel(String.format(EVENT_CHANNEL_NAME, newCase.getTextIndexName())); eventPublisher.openRemoteEventChannel(String.format(EVENT_CHANNEL_NAME, newCase.getTextIndexName()));
currentCase.collaborationMonitor = new CollaborationMonitor(); currentCase.collaborationMonitor = new CollaborationMonitor();
} catch (AutopsyEventException | CollaborationMonitor.CollaborationMonitorException ex) { } catch (AutopsyEventException | CollaborationMonitor.CollaborationMonitorException ex) {
currentCase.collaborationMonitor.shutdown();
logger.log(Level.SEVERE, "Failed to setup for collaboration", ex); 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")); MessageNotifyUtil.Notify.error(NbBundle.getMessage(Case.class, "Case.CollaborationSetup.FailNotify.Title"), NbBundle.getMessage(Case.class, "Case.CollaborationSetup.FailNotify.ErrMsg"));
} }

2
Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java
View File

@ -173,7 +173,7 @@ final class CollaborationMonitor {
} }
Case.removeEventSubscriber(CASE_EVENTS_OF_INTEREST, localTasksManager); Case.removeEventSubscriber(CASE_EVENTS_OF_INTEREST, localTasksManager);
eventPublisher.removeSubscriber(COLLABORATION_MONITOR_EVENT, remoteTasksManager); IngestManager.getInstance().removeIngestJobEventListener(localTasksManager);
if (null != eventPublisher) { if (null != eventPublisher) {
eventPublisher.removeSubscriber(COLLABORATION_MONITOR_EVENT, remoteTasksManager); eventPublisher.removeSubscriber(COLLABORATION_MONITOR_EVENT, remoteTasksManager);