From 1205f6f534412f3e2deb88b86f66ae58b07aab8a Mon Sep 17 00:00:00 2001
From: Yang Gao <yangg@google.com>
Date: Sun, 22 Mar 2015 15:18:14 -0700
Subject: [PATCH] Set cq_ on servercontext

---
 src/cpp/server/server.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index 5a4ca6915a4..9dbf3392d82 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -107,6 +107,7 @@ class Server::SyncRequest GRPC_FINAL : public CompletionQueueTag {
           request_payload_(mrd->request_payload_),
           method_(mrd->method_) {
       ctx_.call_ = mrd->call_;
+      ctx_.cq_ = &cq_;
       GPR_ASSERT(mrd->in_flight_);
       mrd->in_flight_ = false;
       mrd->request_metadata_.count = 0;
@@ -364,6 +365,7 @@ class Server::AsyncRequest GRPC_FINAL : public CompletionQueueTag {
       }
     }
     ctx->call_ = call_;
+    ctx->cq_ = cq_;
     Call call(call_, server_, cq_);
     if (orig_status && call_) {
       ctx->BeginCompletionOp(&call);