aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-02-25 19:39:27 -0800
committerGravatar Craig Tiller <ctiller@google.com>2016-02-25 19:39:27 -0800
commit4a76dcd4f91d81c0200c1339903f0bc5dbcabd15 (patch)
treeb73b39f75edf3b948e3e4e66827c52d094ab1842
parent69b093b3601bb01bec66391e28cc9f76b7baf303 (diff)
Fix merge error made at some point
-rw-r--r--src/core/surface/completion_queue.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c
index 8a9bbace08..f6a95ebbd3 100644
--- a/src/core/surface/completion_queue.c
+++ b/src/core/surface/completion_queue.c
@@ -455,7 +455,6 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag,
gpr_mu_unlock(cc->mu);
grpc_exec_ctx_flush(&exec_ctx);
gpr_mu_lock(cc->mu);
- continue;
} else {
grpc_pollset_work(&exec_ctx, POLLSET_FROM_CQ(cc), &worker, now,
iteration_deadline);