Correctly check returned values from writer loans APIs.

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
ros2 · Sep 8, 2024 · 3dfbcb2 · 3dfbcb2
1 parent 76e8958
commit 3dfbcb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/rmw_fastrtps_shared_cpp/src/rmw_publisher.cpp b/rmw_fastrtps_shared_cpp/src/rmw_publisher.cpp
@@ -177,7 +177,7 @@ __rmw_borrow_loaned_message(
   }
 
   auto info = static_cast<CustomPublisherInfo *>(publisher->data);
-  if (!info->data_writer_->loan_sample(*ros_message)) {
+  if (eprosima::fastdds::dds::RETCODE_OK != info->data_writer_->loan_sample(*ros_message)) {
     return RMW_RET_ERROR;
   }
 
@@ -202,7 +202,7 @@ __rmw_return_loaned_message_from_publisher(
   RMW_CHECK_ARGUMENT_FOR_NULL(loaned_message, RMW_RET_INVALID_ARGUMENT);
 
   auto info = static_cast<CustomPublisherInfo *>(publisher->data);
-  if (!info->data_writer_->discard_loan(loaned_message)) {
+  if (eprosima::fastdds::dds::RETCODE_OK != info->data_writer_->discard_loan(loaned_message)) {
     return RMW_RET_ERROR;
   }
 

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_take.cpp b/rmw_fastrtps_shared_cpp/src/rmw_take.cpp
@@ -643,7 +643,8 @@ __rmw_return_loaned_message_from_subscription(
   std::unique_ptr<rmw_fastrtps_shared_cpp::LoanManager::Item> item;
   item = info->loan_manager_->erase_item(loaned_message);
   if (item != nullptr) {
-    if (!info->data_reader_->return_loan(item->data_seq, item->info_seq)) {
+    auto ret_code = info->data_reader_->return_loan(item->data_seq, item->info_seq);
+    if (eprosima::fastdds::dds::RETCODE_OK != ret_code) {
       RMW_SET_ERROR_MSG("Error returning loan");
       return RMW_RET_ERROR;
     }