diff options
| -rw-r--r-- | src/core/lib/surface/completion_queue.c | 1 | ||||
| -rw-r--r-- | src/cpp/server/server_cc.cc | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/lib/surface/completion_queue.c b/src/core/lib/surface/completion_queue.c index 237ea25943..3d82a32e82 100644 --- a/src/core/lib/surface/completion_queue.c +++ b/src/core/lib/surface/completion_queue.c @@ -554,7 +554,6 @@ static bool cq_begin_op_for_next(grpc_completion_queue *cq, void *tag) { while (true) { gpr_atm count = gpr_atm_no_barrier_load(&cqd->pending_events); if (count == 0) { - cq_check_tag(cq, tag, true); /* Used in debug builds only */ return false; } else if (gpr_atm_no_barrier_cas(&cqd->pending_events, count, count + 1)) { break; diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index 91d980494d..2483300cb1 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -151,10 +151,11 @@ class Server::SyncRequest final : public CompletionQueueTag { GPR_ASSERT(cq_ && !in_flight_); in_flight_ = true; if (tag_) { - if (grpc_server_request_registered_call( + if (GRPC_CALL_OK != + grpc_server_request_registered_call( server, tag_, &call_, &deadline_, &request_metadata_, has_request_payload_ ? &request_payload_ : nullptr, cq_, - notify_cq, this) != GRPC_CALL_OK) { + notify_cq, this)) { TeardownRequest(); return; } |