node_handle must be destroyed after client_handle to prevent memory l…

…eak (#1562) (#1565) Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
ros2 · Feb 27, 2021 · 47f21da · 47f21da
1 parent 8f2809d
commit 47f21da
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/rclcpp_action/src/client.cpp b/rclcpp_action/src/client.cpp
@@ -100,8 +100,9 @@ class ClientBaseImpl
 
   rclcpp::Context::SharedPtr context_;
   rclcpp::node_interfaces::NodeGraphInterface::WeakPtr node_graph_;
-  std::shared_ptr<rcl_action_client_t> client_handle{nullptr};
+  // node_handle must be destroyed after client_handle to prevent memory leak
   std::shared_ptr<rcl_node_t> node_handle{nullptr};
+  std::shared_ptr<rcl_action_client_t> client_handle{nullptr};
   rclcpp::Logger logger;
 
   using ResponseCallback = std::function<void (std::shared_ptr<void> response)>;