diff options
| author |  vjpai <vpai@google.com> | 2015-05-28 10:09:32 -0700 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2015-05-28 10:09:32 -0700 |
| commit | 675140ca1d394f564f2156add8a1a18a2dc132b7 (patch) | |
| tree | 78fd267e9b416c1ef00514052b54b93ecdbdb4d1 /src/cpp/server/server.cc | |
| parent | efad2ae67478ca70c064683af42c7f4bcfca5908 (diff) | |
| parent | 5e9757bf0f8ada75068038c3e29d8b1e875d2ce3 (diff) | |
Merge branch 'master' into poisson
Conflicts:
Makefile
test/cpp/qps/client_async.cc
test/cpp/qps/qpstest.proto
Diffstat (limited to 'src/cpp/server/server.cc')
| -rw-r--r-- | src/cpp/server/server.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index 62f4020d7e..e66b4ed2d8 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server.cc @@ -149,7 +149,7 @@ class Server::SyncRequest GRPC_FINAL : public CompletionQueueTag { } buf.AddServerSendStatus(&ctx_.trailing_metadata_, status); call_.PerformOps(&buf); - GPR_ASSERT(cq_.Pluck(&buf)); + cq_.Pluck(&buf); /* status ignored */ void* ignored_tag; bool ignored_ok; cq_.Shutdown(); |