diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-01 16:42:06 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-01 16:42:06 -0800 |
| commit | 5da3fae40fba30c929d6ed2ea90a8b18922a46f2 (patch) | |
| tree | e158b95ce02ae9885895d36df10ad9b0fcc00896 /src | |
| parent | 783e8ed5105e5124fdddde0a7f4ae2e9a70a56c6 (diff) | |
| parent | 06c98fa49a6a92d230932b79a153de03a2f16db9 (diff) | |
Merge pull request #5517 from jtattermusch/csharp_fix_rststream8
Don't do a "safety" Cancel when recv_close_on_server.cancelled is set.
Diffstat (limited to 'src')
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/AsyncCallServer.cs | 10 | ||||
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs | 4 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/csharp/Grpc.Core/Internal/AsyncCallServer.cs b/src/csharp/Grpc.Core/Internal/AsyncCallServer.cs index b72cbd795f..9380c0d0ea 100644 --- a/src/csharp/Grpc.Core/Internal/AsyncCallServer.cs +++ b/src/csharp/Grpc.Core/Internal/AsyncCallServer.cs @@ -193,16 +193,6 @@ namespace Grpc.Core.Internal lock (myLock) { finished = true; - - if (cancelled) - { - // Once we cancel, we don't have to care that much - // about reads and writes. - - // TODO(jtattermusch): is this still necessary? - Cancel(); - } - ReleaseResourcesIfPossible(); } // TODO(jtattermusch): handle error diff --git a/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs b/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs index 18168f9970..0d12c4168c 100644 --- a/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs +++ b/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs @@ -1,6 +1,6 @@ #region Copyright notice and license -// Copyright 2015, Google Inc. +// Copyright 2015-2016, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -140,14 +140,12 @@ namespace Grpc.IntegrationTesting } [Test] - [Ignore("TODO: see #4427")] public async Task StatusCodeAndMessage() { await InteropClient.RunStatusCodeAndMessageAsync(client); } [Test] - [Ignore("TODO: see #4427")] public void UnimplementedMethod() { InteropClient.RunUnimplementedMethod(UnimplementedService.NewClient(channel)); |