Merge pull request #1043 from icodeplus/remove_else_code

remove 'else' code, release lock by destructor
10 years ago · 4c3ee74d4e
parent 42a2e6f1b7 b486ba6b0d
commit 4c3ee74d4e
1 changed files with 6 additions and 6 deletions
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@ -179,12 +179,12 @@ Server::Server(ThreadPoolInterface* thread_pool, bool thread_pool_owned)
      thread_pool_owned_(thread_pool_owned) {}

 Server::~Server() {
-  std::unique_lock<std::mutex> lock(mu_);
-  if (started_ && !shutdown_) {
-    lock.unlock();
-    Shutdown();
-  } else {
-    lock.unlock();
+  {
+    std::unique_lock<std::mutex> lock(mu_);
+    if (started_ && !shutdown_) {
+      lock.unlock();
+      Shutdown();
+    }
  }
  grpc_server_destroy(server_);
  if (thread_pool_owned_) {