Remove the unneeded initialized function from rmw_client_data.

Not only is this unneeded, it is also improperly initialized so was causing some problems in tests. Signed-off-by: Chris Lalancette <[email protected]>
ros2 · Nov 13, 2024 · 4118b30 · 4118b30
1 parent 91edead
commit 4118b30
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp
@@ -532,7 +532,7 @@ rmw_ret_t ClientData::shutdown()
 {
   rmw_ret_t ret = RMW_RET_OK;
   std::lock_guard<std::mutex> lock(mutex_);
-  if (is_shutdown_ || !initialized_) {
+  if (is_shutdown_) {
     return ret;
   }
 
@@ -545,7 +545,6 @@ rmw_ret_t ClientData::shutdown()
   }
 
   is_shutdown_ = true;
-  initialized_ = false;
   return RMW_RET_OK;
 }
 

diff --git a/rmw_zenoh_cpp/src/detail/rmw_client_data.hpp b/rmw_zenoh_cpp/src/detail/rmw_client_data.hpp
@@ -139,8 +139,6 @@ class ClientData final : public std::enable_shared_from_this<ClientData>
   size_t sequence_number_;
   // Shutdown flag.
   bool is_shutdown_;
-  // Whether the object has ever successfully been initialized.
-  bool initialized_;
 };
 using ClientDataPtr = std::shared_ptr<ClientData>;
 using ClientDataConstPtr = std::shared_ptr<const ClientData>;