Fix proxies to accept multiple Dispose calls

microsoft · Aug 25, 2020 · 64c9625 · 64c9625
1 parent d7f63d6
commit 64c9625
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/StreamJsonRpc.Tests/DisposableProxyTests.cs b/src/StreamJsonRpc.Tests/DisposableProxyTests.cs
@@ -82,12 +82,12 @@ public async Task IDisposableInNotificationArgumentIsRejected()
     }
 
     [Fact]
-    public async Task DisposableReturnValue_DisposeThrowsOnSecondCall()
+    public async Task DisposableReturnValue_DisposeSwallowsSecondCall()
     {
         IDisposable? proxyDisposable = await this.client.GetDisposableAsync();
         Assumes.NotNull(proxyDisposable);
         proxyDisposable.Dispose();
-        Assert.Throws<ObjectDisposedException>(proxyDisposable.Dispose);
+        proxyDisposable.Dispose();
     }
 
     [Fact]

diff --git a/src/StreamJsonRpc.Tests/JsonRpcProxyGenerationTests.cs b/src/StreamJsonRpc.Tests/JsonRpcProxyGenerationTests.cs
@@ -254,6 +254,14 @@ public void IsDisposedReturnsTrueWhenJsonRpcIsDisposed()
         Assert.True(disposableClient.IsDisposed);
     }
 
+    [Fact]
+    public void DisposeTwiceDoesNotThrow()
+    {
+        var disposableClient = (IDisposable)this.clientRpc;
+        disposableClient.Dispose();
+        disposableClient.Dispose();
+    }
+
     [Fact]
     public async Task TaskReturningRpcMethodsThrowAfterDisposal()
     {

diff --git a/src/StreamJsonRpc/ProxyGeneration.cs b/src/StreamJsonRpc/ProxyGeneration.cs
@@ -525,7 +525,13 @@ private static void ImplementDisposeMethod(TypeBuilder proxyTypeBuilder, FieldBu
                 Type.EmptyTypes);
             ILGenerator il = methodBuilder.GetILGenerator();
 
-            EmitThrowIfDisposed(proxyTypeBuilder, il, disposedField);
+            // if (this.disposed) { return; }
+            Label notDisposedLabel = il.DefineLabel();
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, disposedField);
+            il.Emit(OpCodes.Brfalse_S, notDisposedLabel);
+            il.Emit(OpCodes.Ret);
+            il.MarkLabel(notDisposedLabel);
 
             // this.disposed = true;
             il.Emit(OpCodes.Ldarg_0);