commit dd692b34c73fb2db8bc9e8de4b117e753a3d69f7
author Jan Tattermusch <jtattermusch@users.noreply.github.com> Wed Jun 15 12:35:25 2016 -0700
committer GitHub <noreply@github.com> Wed Jun 15 12:35:25 2016 -0700
tree 53bd3a39db06fdb9d1c5fd65c5add421cfbcb52b
parent efcaa4bc10f43e797bd60bbd2145cc83e291b5af
parent b8d50af3a58f99a4c0d379d9a68f7bc4dd383f7e

Merge pull request #6908 from jtattermusch/csharp_send_completion_dedup

C#: dedup code for send finished handler

src/csharp/Grpc.Core/Internal/AsyncCall.cs

diff --git a/src/csharp/Grpc.Core/Internal/AsyncCall.cs b/src/csharp/Grpc.Core/Internal/AsyncCall.cs
index 895be69..f549c52 100644
--- a/src/csharp/Grpc.Core/Internal/AsyncCall.cs
+++ b/src/csharp/Grpc.Core/Internal/AsyncCall.cs
@@ -267,7 +267,7 @@
                     halfcloseRequested = true;
                     return Task.FromResult<object>(null);
                 }
-                call.StartSendCloseFromClient(HandleSendCloseFromClientFinished);
+                call.StartSendCloseFromClient(HandleSendFinished);
 
                 halfcloseRequested = true;
                 streamingWriteTcs = new TaskCompletionSource<object>();

src/csharp/Grpc.Core/Internal/AsyncCallBase.cs

diff --git a/src/csharp/Grpc.Core/Internal/AsyncCallBase.cs b/src/csharp/Grpc.Core/Internal/AsyncCallBase.cs
index cb8366c..eb9c3ea 100644
--- a/src/csharp/Grpc.Core/Internal/AsyncCallBase.cs
+++ b/src/csharp/Grpc.Core/Internal/AsyncCallBase.cs
@@ -248,7 +248,7 @@
         }
 
         /// <summary>
-        /// Handles send completion.
+        /// Handles send completion (including SendCloseFromClient).
         /// </summary>
         protected void HandleSendFinished(bool success)
         {
@@ -272,31 +272,6 @@
         }
 
         /// <summary>
-        /// Handles halfclose (send close from client) completion.
-        /// </summary>
-        protected void HandleSendCloseFromClientFinished(bool success)
-        {
-            TaskCompletionSource<object> origTcs = null;
-            lock (myLock)
-            {
-                origTcs = streamingWriteTcs;
-                streamingWriteTcs = null;
-
-                ReleaseResourcesIfPossible();
-            }
-
-            if (!success)
-            {
-                // TODO(jtattermusch): this method is same as HandleSendFinished (only the error message differs).
-                origTcs.SetException(new InvalidOperationException("Sending close from client has failed."));
-            }
-            else
-            {
-                origTcs.SetResult(null);
-            }
-        }
-
-        /// <summary>
         /// Handles send status from server completion.
         /// </summary>
         protected void HandleSendStatusFromServerFinished(bool success)