aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-06-13 10:10:21 -0700
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-06-13 10:10:21 -0700
commite4fd5b9fe2f95209606571b0761928369ee507ec (patch)
treefd374b9976f4f8aa277dc6e6ee2b14ec4e21ad97 /src
parent5fa6b5db394d62d13a161c94780e12ed2ce79bae (diff)
C# merge fixups
Diffstat (limited to 'src')
-rw-r--r--src/csharp/Grpc.Core.Tests/Internal/AsyncCallTest.cs1
-rw-r--r--src/csharp/Grpc.Core/Channel.cs1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Core.Tests/Internal/AsyncCallTest.cs b/src/csharp/Grpc.Core.Tests/Internal/AsyncCallTest.cs
index 74b104e5a4..98e27a17a1 100644
--- a/src/csharp/Grpc.Core.Tests/Internal/AsyncCallTest.cs
+++ b/src/csharp/Grpc.Core.Tests/Internal/AsyncCallTest.cs
@@ -210,6 +210,7 @@ namespace Grpc.Core.Internal.Tests
new Metadata());
AssertUnaryResponseSuccess(asyncCall, fakeCall, resultTask);
+
var writeTask = requestStream.WriteAsync("request1");
var ex = Assert.ThrowsAsync<RpcException>(async () => await writeTask);
Assert.AreEqual(Status.DefaultSuccess, ex.Status);
diff --git a/src/csharp/Grpc.Core/Channel.cs b/src/csharp/Grpc.Core/Channel.cs
index e485f0807c..4f29c35b32 100644
--- a/src/csharp/Grpc.Core/Channel.cs
+++ b/src/csharp/Grpc.Core/Channel.cs
@@ -31,7 +31,6 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Threading;
using System.Threading.Tasks;