commit fbf8a37c5eafcb1f9b27d9bdaac73040785dd6b6
author Yang Gao <yangg@google.com> Mon Mar 30 10:44:05 2015 -0700
committer Yang Gao <yangg@google.com> Mon Mar 30 10:44:05 2015 -0700
tree 10211221689f95049b3156d6c153297c23de88cb
parent 1205f6f534412f3e2deb88b86f66ae58b07aab8a
parent 675de61e4ba46f6910eab9051ea77ee73cdf8c28

Merge branch 'master' into cancel

src/cpp/server/server.cc

diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index 8e6a6cf..bd0a237 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -107,6 +107,7 @@
           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 @@
       }
     }
     ctx->call_ = call_;
+    ctx->cq_ = cq_;
     Call call(call_, server_, cq_);
     if (orig_status && call_) {
       ctx->BeginCompletionOp(&call);