Merge branch 'test_affine' into reuse_affinity

9 years ago · eaad642cf5
parent 316f9c8470 2272d7a140
commit eaad642cf5
1 changed files with 6 additions and 1 deletions
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@ -295,7 +295,12 @@ Server::Server(ThreadPoolInterface* thread_pool, bool thread_pool_owned,
  grpc_channel_args channel_args;
  args->SetChannelArgs(&channel_args);
  server_ = grpc_server_create(&channel_args, nullptr);
-  grpc_server_register_completion_queue(server_, cq_.cq(), nullptr);
+  if (thread_pool_ == nullptr) {
+    grpc_server_register_non_listening_completion_queue(server_, cq_.cq(),
+                                                        nullptr);
+  } else {
+    grpc_server_register_completion_queue(server_, cq_.cq(), nullptr);
+  }
 }

 Server::~Server() {