Merge pull request #5517 from jtattermusch/csharp_fix_rststream8

Don't do a "safety" Cancel when recv_close_on_server.cancelled is set.
pull/5524/head
Jan Tattermusch 9 years ago
commit 5da3fae40f
  1. 10
      src/csharp/Grpc.Core/Internal/AsyncCallServer.cs
  2. 4
      src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.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

@ -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));

Loading…
Cancel
Save