From 1b183660905c483befb25412f6ca94d6167f4c4c Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Mon, 30 Aug 2021 21:58:24 +0200
Subject: [PATCH] [Fix] Properly handle UserMessageException has a warning in
 services

---
 .../li/strolch/persistence/api/AbstractTransaction.java  | 2 +-
 .../java/li/strolch/service/api/AbstractService.java     | 9 ++++++---
 .../main/java/li/strolch/model/UserMessageException.java | 3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java b/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
index 1fc473290..841020394 100644
--- a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
+++ b/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
@@ -1824,7 +1824,7 @@ public abstract class AbstractTransaction implements StrolchTransaction {
 			sb.append(", close="); //$NON-NLS-1$
 			sb.append(formatNanoDuration(closeDuration));
 		}
-		logger.error(sb.toString());
+		logger.warn(sb.toString());
 	}
 
 	private void handleFailure(boolean throwEx, long closeStartNanos, Exception e) {
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 715592945..8acb62c14 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
@@ -570,12 +570,15 @@ public abstract class AbstractService<T extends ServiceArgument, U extends Servi
 
 		} catch (Exception e) {
 			U result = getResultInstance();
-			result.setState(ServiceResultState.EXCEPTION);
 			result.setMessage(e.getMessage());
-			result.setThrowable(e);
 
-			if (e instanceof UserMessageException)
+			if (e instanceof UserMessageException) {
+				result.setState(ServiceResultState.WARNING);
 				result.setI18nMessage(((UserMessageException) e).getI18nMsg());
+			} else {
+				result.setState(ServiceResultState.FAILED);
+				result.setThrowable(e);
+			}
 
 			return result;
 		}
diff --git a/li.strolch.model/src/main/java/li/strolch/model/UserMessageException.java b/li.strolch.model/src/main/java/li/strolch/model/UserMessageException.java
index 68449ae85..819434d03 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/UserMessageException.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/UserMessageException.java
@@ -1,5 +1,7 @@
 package li.strolch.model;
 
+import java.util.Locale;
+
 import li.strolch.utils.I18nMessage;
 import li.strolch.utils.dbc.DBC;
 
@@ -8,6 +10,7 @@ public class UserMessageException extends Exception {
 	private final I18nMessage i18nMsg;
 
 	public UserMessageException(I18nMessage i18nMsg) {
+		super(i18nMsg.getMessage(Locale.getDefault()));
 		DBC.PRE.assertNotNull("i18nMsg must not be null!", i18nMsg);
 		this.i18nMsg = i18nMsg;
 	}