RemotingSession shouldn't overwrite the serialized exception with an …

…empty MessageCallResult message.
theRainbird · Nov 19, 2024 · 2c6ea75 · 2c6ea75
1 parent 59320ff
commit 2c6ea75
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/CoreRemoting.Tests/RpcTests.cs b/CoreRemoting.Tests/RpcTests.cs
@@ -424,7 +424,9 @@ public void Error_method_throws_Exception()
                 client.Connect();
 
                 var proxy = client.CreateProxy<ITestService>();
-                var ex = Assert.Throws<Exception>(() => proxy.Error(nameof(Error_method_throws_Exception)));
+                var ex = Assert.Throws<RemoteInvocationException>(() =>
+                    proxy.Error(nameof(Error_method_throws_Exception)))
+                        .GetInnermostException();
 
                 Assert.NotNull(ex);
                 Assert.Equal(nameof(Error_method_throws_Exception), ex.Message);
@@ -453,10 +455,11 @@ public async Task ErrorAsync_method_throws_Exception()
                 client.Connect();
 
                 var proxy = client.CreateProxy<ITestService>();
-                var ex = await Assert.ThrowsAsync<Exception>(async () =>
-                    await proxy.ErrorAsync(nameof(ErrorAsync_method_throws_Exception)));
+                var ex = (await Assert.ThrowsAsync<RemoteInvocationException>(async () =>
+                    await proxy.ErrorAsync(nameof(ErrorAsync_method_throws_Exception))))
+                        .GetInnermostException();
 
-                Assert.NotNull(ex);
+                Assert.NotNull(ex); 
                 Assert.Equal(nameof(ErrorAsync_method_throws_Exception), ex.Message);
             }
             finally

diff --git a/CoreRemoting.Tests/Tools/ExceptionExtensions.cs b/CoreRemoting.Tests/Tools/ExceptionExtensions.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace CoreRemoting.Tests.Tools;
+
+public static class ExceptionExtensions
+{
+    public static Exception GetInnermostException(this Exception ex)
+    {
+        while (ex?.InnerException != null)
+            ex = ex.InnerException;
+
+        return ex;
+    }
+}
diff --git a/CoreRemoting/RemotingSession.cs b/CoreRemoting/RemotingSession.cs
@@ -539,8 +539,12 @@ private void ProcessRpcMessage(WireMessage request)
                 if (oneWay)
                     return;
 
-                serializedResult =
-                    _server.Serializer.Serialize(serverRpcContext.MethodCallResultMessage);
+                // don't overwrite the serialized exception
+                if (ReferenceEquals(serializedResult, Array.Empty<byte>()))
+                {
+                    serializedResult =
+                        _server.Serializer.Serialize(serverRpcContext.MethodCallResultMessage);
+                }
             }
 
             var methodResultMessage =