Revert "remove package name in RpcMessage. PROTOCOL CHANGED"

This reverts commit 0197724. Cherry-pick: 27c063d
MeteorAtRains · Jan 20, 2017 · 4dd20c1 · 4dd20c1
1 parent 809f6bd
commit 4dd20c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/muduo/net/protorpc/RpcChannel.cc b/muduo/net/protorpc/RpcChannel.cc
@@ -57,7 +57,7 @@ void RpcChannel::CallMethod(const ::google::protobuf::MethodDescriptor* method,
   message.set_type(REQUEST);
   int64_t id = id_.incrementAndGet();
   message.set_id(id);
-  message.set_service(method->service()->name());
+  message.set_service(method->service()->full_name());
   message.set_method(method->name());
   message.set_request(request->SerializeAsString()); // FIXME: error check
 

diff --git a/muduo/net/protorpc/RpcServer.cc b/muduo/net/protorpc/RpcServer.cc
@@ -30,7 +30,7 @@ RpcServer::RpcServer(EventLoop* loop,
 void RpcServer::registerService(google::protobuf::Service* service)
 {
   const google::protobuf::ServiceDescriptor* desc = service->GetDescriptor();
-  services_[desc->name()] = service;
+  services_[desc->full_name()] = service;
 }
 
 void RpcServer::start()