Revert "Service monitor fixes fix"

This reverts commit 0752619302a305430c5e5774266c45202792bb5b.
This commit is contained in:
Richard Cordovano 2015-11-23 13:13:22 -05:00
parent c9a5b81e5d
commit 3b1839c5fa

View File

@ -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,19 +382,17 @@ public class ServicesMonitor {
return;
}
if (Case.isCaseOpen()) {
try {
Case currentCase = Case.getCurrentCase();
if (Case.CaseType.SINGLE_USER_CASE == currentCase.getCaseType()) {
return;
}
} catch (IllegalStateException ignored) {
} catch (IllegalArgumentException ignored) {
/*
* No current case, proceed to check services because multi-user
* cases are enabled.
*/
}
}
for (String service : multiUserServicesList) {
checkMultiUserServiceStatus(service);