From f71d3bfda2b76cedc3a2b74c1344b25d312b4fda Mon Sep 17 00:00:00 2001 From: brawner Date: Tue, 13 Oct 2020 15:13:43 -0700 Subject: [PATCH] Remove finalization of guard_condition from GraphListener::__shutdown() (#1401) Signed-off-by: Stephen Brawner --- rclcpp/src/rclcpp/graph_listener.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/rclcpp/src/rclcpp/graph_listener.cpp b/rclcpp/src/rclcpp/graph_listener.cpp index 5b6fe21..1119052 100644 --- a/rclcpp/src/rclcpp/graph_listener.cpp +++ b/rclcpp/src/rclcpp/graph_listener.cpp @@ -371,17 +371,6 @@ GraphListener::__shutdown(bool should_throw) } else { parent_context_ptr->release_interrupt_guard_condition(&wait_set_, std::nothrow); } - } else { - ret = rcl_guard_condition_fini(shutdown_guard_condition_); - if (RCL_RET_OK != ret) { - if (should_throw) { - throw_from_rcl_error(ret, "failed to finalize shutdown guard condition"); - } else { - RCLCPP_ERROR( - rclcpp::get_logger("rclcpp"), - "failed to finalize shutdown guard condition"); - } - } } shutdown_guard_condition_ = nullptr; }