From 4a76dcd4f91d81c0200c1339903f0bc5dbcabd15 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 25 Feb 2016 19:39:27 -0800
Subject: [PATCH] Fix merge error made at some point
---
src/core/surface/completion_queue.c | 1 -
1 file changed, 1 deletion(-)
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);
--
GitLab