From e87260b352b779a921dc92348ebdb253f8d6c9ee Mon Sep 17 00:00:00 2001
From: Demis Bellot <demis.bellot@gmail.com>
Date: Wed, 3 Jan 2024 12:20:31 +0800
Subject: [PATCH] Call CreateResponseStatus in DtoUtils.CreateResponseStatus()

---
 .../src/ServiceStack.Client/ResponseStatusUtils.cs  |  2 +-
 ServiceStack/src/ServiceStack/DtoUtils.cs           | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ServiceStack/src/ServiceStack.Client/ResponseStatusUtils.cs b/ServiceStack/src/ServiceStack.Client/ResponseStatusUtils.cs
index 3c68f8c39a7..39e345b1410 100644
--- a/ServiceStack/src/ServiceStack.Client/ResponseStatusUtils.cs
+++ b/ServiceStack/src/ServiceStack.Client/ResponseStatusUtils.cs
@@ -26,7 +26,7 @@ public static ResponseStatus CreateResponseStatus(string errorCode, string error
             var to = new ResponseStatus {
                 ErrorCode = errorCode,
                 Message = errorMessage,
-                Errors = new List<ResponseError>(),
+                Errors = [],
             };
             if (validationErrors != null)
             {
diff --git a/ServiceStack/src/ServiceStack/DtoUtils.cs b/ServiceStack/src/ServiceStack/DtoUtils.cs
index c94e7578e4f..76c1153977f 100644
--- a/ServiceStack/src/ServiceStack/DtoUtils.cs
+++ b/ServiceStack/src/ServiceStack/DtoUtils.cs
@@ -18,14 +18,15 @@ public static class DtoUtils
     public static ResponseStatus CreateResponseStatus(Exception ex, object request = null, bool debugMode = false)
     {
         var e = ex.UnwrapIfSingleException();
+        var responseStatus = (e is IResponseStatusConvertible customStatus ? customStatus.ToResponseStatus() : null) 
+            ?? ServiceStackHost.Instance?.CreateResponseStatus(ex, request)
+            ?? ResponseStatusUtils.CreateResponseStatus(e.GetType().Name, e.Message);
             
-        var responseStatus = (e is IResponseStatusConvertible customStatus
-            ? customStatus.ToResponseStatus()
-            : null) ?? ResponseStatusUtils.CreateResponseStatus(e.GetType().Name, e.Message);
-            
-        if (responseStatus == null)
-            return null;
+        return responseStatus == null ? null : PopulateResponseStatus(responseStatus, request, e, debugMode);
+    }
 
+    public static ResponseStatus PopulateResponseStatus(ResponseStatus responseStatus, object request, Exception e, bool debugMode = false)
+    {
         if (debugMode)
         {
 #if !NETCORE