C++ Client: fix one incorrect mutex unlock, remove one needless unlock (

deephaven#4855)
niloc132 · Nov 19, 2023 · e596070 · e596070
1 parent 97b8407
commit e596070
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cpp-client/deephaven/dhclient/src/impl/table_handle_impl.cc b/cpp-client/deephaven/dhclient/src/impl/table_handle_impl.cc
@@ -715,7 +715,7 @@ std::shared_ptr<Schema> TableHandleImpl::Schema() {
   std::unique_lock guard(mutex_);
   if (schema_request_sent_) {
     // Schema request already sent by someone else. So wait for the successful result or error.
-    mutex_.unlock();
+    guard.unlock();
     return schema_future_.get();
   }
 

diff --git a/cpp-client/deephaven/dhclient/src/server/server.cc b/cpp-client/deephaven/dhclient/src/server/server.cc
@@ -362,7 +362,6 @@ void Server::SendRpc(const std::function<grpc::Status(grpc::ClientContext *)> &c
       const char *message = "Server cancelled. All further RPCs are being rejected";
       throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
     }
-    guard.unlock();
   }
 
   auto status = callback(&ctx);