Service side should be done, it builds and existing tests pass

2 files changed, 9 insertions, 1 deletions

diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index 4de1ad290e..6e66cd476c 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -371,6 +371,12 @@ class Server::AsyncRequest GRPC_FINAL : public CompletionQueueTag {
                 array_.metadata[i].value,
                 array_.metadata[i].value + array_.metadata[i].value_length)));
       }
+      if (anonymous_ctx_) {
+        anonymous_ctx_->method_.assign(call_details_.method,
+                                       call_details_.method_capacity);
+        anonymous_ctx_->host_.assign(call_details_.host,
+                                     call_details_.host_capacity);
+      }
     }
     ctx->call_ = call_;
     Call call(call_, server_, cq_);
@@ -403,6 +409,7 @@ void Server::RequestAsyncCall(void* registered_method, ServerContext* context,
                               CompletionQueue* cq, void* tag) {
   new AsyncRequest(this, registered_method, context, request, stream, cq, tag);
 }
+
 void Server::RequestAsyncAnonymousCall(AnonymousServerContext* context,
                                        ServerAsyncStreamingInterface* stream,
                                        CompletionQueue* cq, void* tag) {
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index cc6f8ca9e5..b7e5c84ef6 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -41,7 +41,8 @@
 
 namespace grpc {
 
-ServerBuilder::ServerBuilder() : thread_pool_(nullptr) {}
+ServerBuilder::ServerBuilder()
+    : anonymous_service_(nullptr), thread_pool_(nullptr) {}
 
 void ServerBuilder::RegisterService(SynchronousService* service) {
   services_.push_back(service->service());