aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Abhishek Kumar <abhikumar@google.com>2015-04-23 14:59:49 -0700
committerGravatar Abhishek Kumar <abhikumar@google.com>2015-04-23 14:59:49 -0700
commitd774c5cadb7dab2562901d82d55e921b168b637d (patch)
tree020596dd7ad1336d14ab8c9766b64ed8d7ddcc5f /src
parent3afd92ff511f52db3ecf892d9af65053323c89cb (diff)
Test client stream cancellation and fix bug exposed by the test.
Diffstat (limited to 'src')
-rw-r--r--src/cpp/common/completion_queue.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpp/common/completion_queue.cc b/src/cpp/common/completion_queue.cc
index cea2d24831..cdbe042d21 100644
--- a/src/cpp/common/completion_queue.cc
+++ b/src/cpp/common/completion_queue.cc
@@ -92,7 +92,8 @@ bool CompletionQueue::Pluck(CompletionQueueTag* tag) {
void* ignored = tag;
GPR_ASSERT(tag->FinalizeResult(&ignored, &ok));
GPR_ASSERT(ignored == tag);
- return ok;
+ // Ignore mutations by FinalizeResult: Pluck returns the C API status
+ return ev->data.op_complete == GRPC_OP_OK;
}
void CompletionQueue::TryPluck(CompletionQueueTag* tag) {