Take all available samples on service/client on_data_available. (#616)

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit e9abdc4)

# Conflicts:
#	rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_client_info.hpp
#	rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_service_info.hpp

rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_client_info.hpp

@@ -85,8 +85,13 @@ class ClientListener : public eprosima::fastrtps::SubscriberListener
     data.is_cdr_buffer = true;
     data.data = response.buffer_.get();
     data.impl = nullptr;    // not used when is_cdr_buffer is true
+<<<<<<< HEAD
     if (sub->takeNextData(&data, &response.sample_info_)) {
       if (eprosima::fastrtps::rtps::ALIVE == response.sample_info_.sampleKind) {
+=======
+    while (reader->take_next_sample(&data, &response.sample_info_) == ReturnCode_t::RETCODE_OK) {
+      if (response.sample_info_.valid_data) {
+>>>>>>> e9abdc4 (Take all available samples on service/client on_data_available. (#616))
         response.sample_identity_ = response.sample_info_.related_sample_identity;
 
         if (response.sample_identity_.writer_guid() == info_->reader_guid_ ||

rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_service_info.hpp

@@ -248,8 +248,13 @@ class ServiceListener : public eprosima::fastrtps::SubscriberListener
     data.is_cdr_buffer = true;
     data.data = request.buffer_;
     data.impl = nullptr;    // not used when is_cdr_buffer is true
+<<<<<<< HEAD
     if (sub->takeNextData(&data, &request.sample_info_)) {
       if (eprosima::fastrtps::rtps::ALIVE == request.sample_info_.sampleKind) {
+=======
+    while (reader->take_next_sample(&data, &request.sample_info_) == ReturnCode_t::RETCODE_OK) {
+      if (request.sample_info_.valid_data) {
+>>>>>>> e9abdc4 (Take all available samples on service/client on_data_available. (#616))
         request.sample_identity_ = request.sample_info_.sample_identity;
         // Use response subscriber guid (on related_sample_identity) when present.
         const eprosima::fastrtps::rtps::GUID_t & reader_guid =