From 3b1839c5fa1f94230f0d15d0fbf671dd13a598e3 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Mon, 23 Nov 2015 13:13:22 -0500 Subject: [PATCH] Revert "Service monitor fixes fix" This reverts commit 0752619302a305430c5e5774266c45202792bb5b. --- .../autopsy/core/ServicesMonitor.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java b/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java index 93e44cac78..4071f34b4f 100644 --- a/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java +++ b/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java @@ -176,7 +176,7 @@ public class ServicesMonitor { * If the status has changed, do a log message and create a user * notification message. */ - if ((!statusByService.containsKey(serviceName)) || (statusByService.containsKey(serviceName) && !status.equals(statusByService.get(serviceName)))) { + if (statusByService.containsKey(serviceName) && !status.equals(statusByService.get(serviceName))) { if (status.equals(ServiceStatus.UP.toString())) { logger.log(Level.INFO, "{0} status is up", serviceDisplayName); //NON-NLS MessageNotifyUtil.Notify.info(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.restoredService.notify.title"), @@ -382,18 +382,16 @@ public class ServicesMonitor { return; } - if (Case.isCaseOpen()) { - try { - Case currentCase = Case.getCurrentCase(); - if (Case.CaseType.SINGLE_USER_CASE == currentCase.getCaseType()) { - return; - } - } catch (IllegalStateException ignored) { - /* - * No current case, proceed to check services because multi-user - * cases are enabled. - */ + try { + Case currentCase = Case.getCurrentCase(); + if (Case.CaseType.SINGLE_USER_CASE == currentCase.getCaseType()) { + return; } + } catch (IllegalArgumentException ignored) { + /* + * No current case, proceed to check services because multi-user + * cases are enabled. + */ } for (String service : multiUserServicesList) {