From ec5adde6722ecaa910f19233f74b66fa03e98bb4 Mon Sep 17 00:00:00 2001 From: adam-m Date: Thu, 29 Mar 2012 16:36:42 -0400 Subject: [PATCH] Catch all exceptions in CaseChangeListener, otherwise it would prohibit other handlers from running --- .../autopsy/keywordsearch/KeywordSearch.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java index d28765132e..3c63b940c9 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java @@ -21,6 +21,8 @@ package org.sleuthkit.autopsy.keywordsearch; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.util.logging.Level; +import java.util.logging.Logger; import org.sleuthkit.autopsy.casemodule.Case; /** @@ -61,13 +63,24 @@ class KeywordSearch { Object oldValue = evt.getOldValue(); Object newValue = evt.getNewValue(); + final Logger logger = Logger.getLogger(CaseChangeListener.class.getName()); if (changed.equals(Case.CASE_CURRENT_CASE)) { if (newValue != null) { // new case is open - SERVER.openCore(); + try { + SERVER.openCore(); + } + catch (Exception e) { + logger.log(Level.WARNING, "Could not open core."); + } } else if (oldValue != null) { // a case was closed - SERVER.closeCore(); + try { + SERVER.closeCore(); + } + catch (Exception e) { + logger.log(Level.WARNING, "Could not close core."); + } } } }