From c822f0047387bf5c1a32806b92a82999c6ac061d Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Wed, 28 Aug 2019 12:04:46 +0200
Subject: [PATCH] [Major] Added new service result EXCEPTION used when
 exception thrown

---
 .../li/strolch/service/api/AbstractService.java     |  4 ++--
 .../strolch/service/api/DefaultServiceHandler.java  | 13 ++++++++++---
 .../li/strolch/service/api/ServiceResultState.java  |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java b/li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java
index b52419518..c578febfc 100644
--- a/li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java
+++ b/li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java
@@ -525,7 +525,7 @@ public abstract class AbstractService<T extends ServiceArgument, U extends Servi
 			logger.error(msg);
 
 			U result = getResultInstance();
-			result.setState(ServiceResultState.FAILED);
+			result.setState(ServiceResultState.EXCEPTION);
 			result.setMessage(msg);
 			return result;
 		}
@@ -543,7 +543,7 @@ public abstract class AbstractService<T extends ServiceArgument, U extends Servi
 
 		} catch (Exception e) {
 			U result = getResultInstance();
-			result.setState(ServiceResultState.FAILED);
+			result.setState(ServiceResultState.EXCEPTION);
 			result.setMessage(e.getMessage());
 			result.setThrowable(e);
 			return result;
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 c4861278d..b796d3c79 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
@@ -99,7 +99,7 @@ public class DefaultServiceHandler extends StrolchComponent implements ServiceHa
 				@SuppressWarnings("unchecked")
 				U arg = (U) abstractService.getResultInstance();
 				arg.setState(e instanceof PrivilegeModelException ?
-						ServiceResultState.FAILED :
+						ServiceResultState.EXCEPTION :
 						ServiceResultState.ACCESS_DENIED);
 				arg.setMessage(e.getMessage());
 				arg.setThrowable(e);
@@ -187,6 +187,7 @@ public class DefaultServiceHandler extends StrolchComponent implements ServiceHa
 			}
 
 		} else if (serviceResult.getState() == ServiceResultState.FAILED
+				|| serviceResult.getState() == ServiceResultState.EXCEPTION
 				|| serviceResult.getState() == ServiceResultState.ACCESS_DENIED) {
 
 			msg = serviceResult.getState() + ": " + msg;
@@ -203,9 +204,15 @@ public class DefaultServiceHandler extends StrolchComponent implements ServiceHa
 				reason = serviceResult.getThrowable().getMessage();
 				throwable = serviceResult.getThrowable();
 			}
-			logger.error("Reason: " + reason, throwable);
 
-			if (getContainer().hasComponent(OperationsLog.class)) {
+			if (throwable == null)
+				logger.error("Reason: " + reason);
+			else
+				logger.error("Reason: " + reason, throwable);
+
+			if ((serviceResult.getState() == ServiceResultState.EXCEPTION
+					|| serviceResult.getState() == ServiceResultState.ACCESS_DENIED) //
+					&& getContainer().hasComponent(OperationsLog.class)) {
 
 				LogMessage logMessage;
 
diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/ServiceResultState.java b/li.strolch.agent/src/main/java/li/strolch/service/api/ServiceResultState.java
index a8224d2d3..2775fb6ac 100644
--- a/li.strolch.agent/src/main/java/li/strolch/service/api/ServiceResultState.java
+++ b/li.strolch.agent/src/main/java/li/strolch/service/api/ServiceResultState.java
@@ -21,5 +21,5 @@ package li.strolch.service.api;
  */
 public enum ServiceResultState {
 
-	SUCCESS, WARNING, FAILED, ACCESS_DENIED;
+	SUCCESS, WARNING, FAILED, EXCEPTION, ACCESS_DENIED;
 }