Feedback from review.

Signed-off-by: Chris Lalancette <[email protected]>
ros2 · Oct 16, 2024 · efd8918 · efd8918
1 parent 5462937
commit efd8918
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/rmw_zenoh_cpp/src/detail/rmw_subscription_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_subscription_data.cpp
@@ -212,7 +212,8 @@ SubscriptionData::SubscriptionData(
   last_known_published_msg_({}),
   total_messages_lost_(0),
   wait_set_data_(nullptr),
-  is_shutdown_(false)
+  is_shutdown_(false),
+  initialized_(false)
 {
   events_mgr_ = std::make_shared<EventsManager>();
 }
@@ -365,7 +366,7 @@ bool SubscriptionData::init()
   undeclare_z_sub.cancel();
   free_token.cancel();
 
-  initted_ = true;
+  initialized_ = true;
 
   return true;
 }
@@ -416,7 +417,7 @@ rmw_ret_t SubscriptionData::shutdown()
 {
   rmw_ret_t ret = RMW_RET_OK;
   std::lock_guard<std::mutex> lock(mutex_);
-  if (is_shutdown_ || !initted_) {
+  if (is_shutdown_ || !initialized_) {
     return ret;
   }
 
@@ -451,7 +452,7 @@ rmw_ret_t SubscriptionData::shutdown()
   }
 
   is_shutdown_ = true;
-  initted_ = false;
+  initialized_ = false;
   return ret;
 }
 

diff --git a/rmw_zenoh_cpp/src/detail/rmw_subscription_data.hpp b/rmw_zenoh_cpp/src/detail/rmw_subscription_data.hpp
@@ -134,8 +134,6 @@ class SubscriptionData final : public std::enable_shared_from_this<SubscriptionD
 
   bool init();
 
-  bool initted_{false};
-
   // Internal mutex.
   mutable std::mutex mutex_;
   // The parent node.
@@ -162,6 +160,8 @@ class SubscriptionData final : public std::enable_shared_from_this<SubscriptionD
   std::shared_ptr<EventsManager> events_mgr_;
   // Shutdown flag.
   bool is_shutdown_;
+  // Whether the object has ever successfully been initialized.
+  bool initialized_;
 };
 using SubscriptionDataPtr = std::shared_ptr<SubscriptionData>;
 using SubscriptionDataConstPtr = std::shared_ptr<const SubscriptionData>;