From d0a40a4bbab3cbe8cf4c2911ecac50610fefb0eb Mon Sep 17 00:00:00 2001
From: Liu Jiaming <liujiaming02@baidu.com>
Date: Wed, 25 Dec 2019 21:41:52 +0800
Subject: [PATCH] clean & clear code

---
 cyber/service/client.h  |  4 ++--
 cyber/service/service.h | 10 +---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/cyber/service/client.h b/cyber/service/client.h
index 4e6bcf2e21..2e077dba8e 100644
--- a/cyber/service/client.h
+++ b/cyber/service/client.h
@@ -205,12 +205,12 @@ bool Client<Request, Response>::Init() {
   role.set_channel_id(channel_id);
   response_receiver_ = transport->CreateReceiver<Response>(
       role,
-      [=](const std::shared_ptr<Response>& request,
+      [=](const std::shared_ptr<Response>& response,
           const transport::MessageInfo& message_info,
           const proto::RoleAttributes& reader_attr) {
         (void)message_info;
         (void)reader_attr;
-        response_callback_(request, message_info);
+        response_callback_(response, message_info);
       },
       proto::OptionalMode::RTPS);
   if (response_receiver_ == nullptr) {
diff --git a/cyber/service/service.h b/cyber/service/service.h
index 19e47f4f40..3551aa058f 100644
--- a/cyber/service/service.h
+++ b/cyber/service/service.h
@@ -79,15 +79,7 @@ class Service : public ServiceBase {
   Service() = delete;
 
   ~Service() {
-    inited_ = false;
-    {
-      std::lock_guard<std::mutex> lg(queue_mutex_);
-      tasks_.clear();
-    }
-    condition_.notify_all();
-    if (thread_.joinable()) {
-      thread_.join();
-    }
+    destroy();
   }
 
   /**
-- 
GitLab