aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Michael Lumish <mlumish@google.com>2015-09-16 14:24:26 -0700
committerGravatar Michael Lumish <mlumish@google.com>2015-09-16 14:24:26 -0700
commit3115638631b10ed79b8edb59669021c6050d46ef (patch)
tree777e4af4a0128ec25b644d6a58c4cd2eefab8c7f
parente8659971a9cedeccb90d39d2dfe784048baa2f19 (diff)
parent156a7b6e0f657ea6a1df1cf6574003920f0da714 (diff)
Merge pull request #3354 from grpc/jtattermusch-patch-2
Don't do .Wait() in async context.
-rw-r--r--src/csharp/Grpc.IntegrationTesting/InteropClient.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs
index 0884c6ea60..616093d4ae 100644
--- a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs
+++ b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs
@@ -131,7 +131,7 @@ namespace Grpc.IntegrationTesting
var channel = new Channel(options.ServerHost, options.ServerPort, credentials, channelOptions);
TestService.TestServiceClient client = new TestService.TestServiceClient(channel);
await RunTestCaseAsync(client, options);
- channel.ShutdownAsync().Wait();
+ await channel.ShutdownAsync();
}
private async Task RunTestCaseAsync(TestService.TestServiceClient client, ClientOptions options)