Refs #20742: Add Miguel' suggestion

Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Apr 26, 2024 · e9e08fd · e9e08fd
1 parent 1db708d
commit e9e08fd
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp
@@ -1787,15 +1787,20 @@ DataReaderListener* DataReaderImpl::get_listener_for(
 std::shared_ptr<IPayloadPool> DataReaderImpl::get_payload_pool()
 {
     // Check whether DataReader's type is plain in all its data representations
-    bool is_plain = type_->is_plain();
+    bool is_plain = true;
     if (qos_.type_consistency().representation.m_value.size() > 0)
     {
-        is_plain = true;
         for (auto data_representation : qos_.type_consistency().representation.m_value)
         {
             is_plain = is_plain && type_->is_plain(data_representation);
         }
     }
+    // If data representation is not defined, consider both XCDR representations
+    else
+    {
+        is_plain = type_->is_plain(DataRepresentationId_t::XCDR_DATA_REPRESENTATION)
+            && type_->is_plain(DataRepresentationId_t::XCDR2_DATA_REPRESENTATION);
+    }
 
     // When the user requested PREALLOCATED_WITH_REALLOC, but we know the type cannot
     // grow, we translate the policy into bare PREALLOCATED