Merge pull request #1220 from microsoft/OutOfOrderMarshalledObjectDisposal

Avoid 1-2 first chance exceptions on out of order disposal

Author: AArnott

src/StreamJsonRpc/Reflection/MessageFormatterRpcMarshaledContextTracker.cs

@@ -346,13 +346,16 @@ internal MarshalToken GetToken(
                 MethodNameTransform = mn => Invariant($"$/invokeProxy/{token.Value.Handle}/{options.MethodNameTransform(mn)}"),
                 OnDispose = token.Value.Lifetime == MarshalLifetime.Call ? null : delegate
                 {
-                    // Only forward the Dispose call if the marshaled interface derives from IDisposable.
-                    if (typeof(IDisposable).IsAssignableFrom(interfaceType))
+                    if (!this.jsonRpc.IsDisposed)
                     {
-                        this.jsonRpc.NotifyAsync(Invariant($"$/invokeProxy/{token.Value.Handle}/{options.MethodNameTransform(nameof(IDisposable.Dispose))}")).Forget();
-                    }
+                        // Only forward the Dispose call if the marshaled interface derives from IDisposable.
+                        if (typeof(IDisposable).IsAssignableFrom(interfaceType))
+                        {
+                            this.jsonRpc.NotifyAsync(Invariant($"$/invokeProxy/{token.Value.Handle}/{options.MethodNameTransform(nameof(IDisposable.Dispose))}")).Forget();
+                        }
 
-                    this.jsonRpc.NotifyWithParameterObjectAsync("$/releaseMarshaledObject", new { handle = token.Value.Handle, ownedBySender = false }).Forget();
+                        this.jsonRpc.NotifyWithParameterObjectAsync("$/releaseMarshaledObject", new { handle = token.Value.Handle, ownedBySender = false }).Forget();
+                    }
                 },
             },
             token.Value.Handle);

test/StreamJsonRpc.Tests/MarshalableProxyTests.cs

@@ -585,6 +585,15 @@ public async Task IMarshalable_MarshaledBackAndForth()
         Assert.Same(this.server.ReturnedMarshalable, this.server.ReceivedProxy);
     }
 
+    [Fact]
+    public async Task MarshableDisposedAfterConnection()
+    {
+        IMarshalable? proxyMarshalable = await this.client.GetMarshalableAsync().WithCancellation(this.TimeoutToken);
+        Assert.NotNull(proxyMarshalable);
+        this.clientRpc.Dispose();
+        proxyMarshalable.Dispose();
+    }
+
     [Fact]
     public async Task IMarshalable_MarshaledAndForwarded()
     {