From 4e6f7a916f26386fbcd8cf068ac172f98bba493a Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 24 Aug 2015 09:41:24 +0200 Subject: [PATCH] [Minor] also log situations where no service state is returned --- .../strolch/service/api/DefaultServiceHandler.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java b/li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java index 10c82b4f7..4faa6a29a 100644 --- a/li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java +++ b/li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java @@ -17,6 +17,10 @@ package li.strolch.service.api; import java.text.MessageFormat; +import ch.eitchnet.privilege.base.PrivilegeException; +import ch.eitchnet.privilege.model.Certificate; +import ch.eitchnet.privilege.model.PrivilegeContext; +import ch.eitchnet.utils.helper.StringHelper; import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.StrolchComponent; import li.strolch.exception.StrolchAccessDeniedException; @@ -24,10 +28,6 @@ import li.strolch.exception.StrolchException; import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.RuntimeConfiguration; import li.strolch.runtime.privilege.PrivilegeHandler; -import ch.eitchnet.privilege.base.PrivilegeException; -import ch.eitchnet.privilege.model.Certificate; -import ch.eitchnet.privilege.model.PrivilegeContext; -import ch.eitchnet.utils.helper.StringHelper; /** * @author Robert von Burg @@ -168,6 +168,12 @@ public class DefaultServiceHandler extends StrolchComponent implements ServiceHa } else if (serviceResult.getThrowable() != null) { logger.error("Reason: " + serviceResult.getThrowable().getMessage(), serviceResult.getThrowable()); } + } else if (serviceResult.getState() == null) { + logger.warn("Service " + service.getClass().getName() + " returned a null ServiceResultState!"); + logger.warn(msg); + } else { + logger.warn("UNHANDLED SERVICE RESULT STATE: " + serviceResult.getState()); + logger.warn(msg); } } }