Set DataSharing in Writer|ReaderProxyData (#4761)

* Refs #20933: Set datasharing on when pid is found Signed-off-by: elianalf <[email protected]> * Refs #20933: Set datasharing off after the clear Signed-off-by: elianalf <[email protected]> * Refs #20933: Add tests Signed-off-by: elianalf <[email protected]> * Refs #20933: Fix other_vendor_parameter_list_with_custom_pids test Signed-off-by: elianalf <[email protected]> * Refs #20933: Change implementation to fix failing tests Signed-off-by: elianalf <[email protected]> * Refs #20933: Apply suggestions Signed-off-by: elianalf <[email protected]> --------- Signed-off-by: elianalf <[email protected]> (cherry picked from commit 904c523) # Conflicts: # test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
eProsima · May 17, 2024 · fcd6e76 · fcd6e76
1 parent f8d09ba
commit fcd6e76
Show file tree

Hide file tree

Showing 4 changed files with 540 additions and 1 deletion.
diff --git a/src/cpp/fastdds/core/policy/QosPoliciesSerializer.hpp b/src/cpp/fastdds/core/policy/QosPoliciesSerializer.hpp
@@ -855,7 +855,7 @@ inline bool QosPoliciesSerializer<DataSharingQosPolicy>::read_content_from_cdr_m
     uint32_t pos_ref = cdr_message->pos;
 
     // If the parameter is sent, the remote endpoint is datasharing compatible
-    qos_policy.automatic();
+    qos_policy.on(".");
 
     uint32_t num_domains = 0;
     bool valid = fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &num_domains);

diff --git a/src/cpp/rtps/builtin/data/ReaderProxyData.cpp b/src/cpp/rtps/builtin/data/ReaderProxyData.cpp
@@ -994,6 +994,7 @@ bool ReaderProxyData::readFromCDRMessage(
                                     "Received with error.");
                             return false;
                         }
+
                         break;
                     }
 
@@ -1008,6 +1009,7 @@ bool ReaderProxyData::readFromCDRMessage(
 
     uint32_t qos_size;
     clear();
+    m_qos.data_sharing.off();
     try
     {
         if (ParameterList::readParameterListfromCDRMsg(*msg, param_process, true, qos_size))

diff --git a/src/cpp/rtps/builtin/data/WriterProxyData.cpp b/src/cpp/rtps/builtin/data/WriterProxyData.cpp
@@ -986,6 +986,7 @@ bool WriterProxyData::readFromCDRMessage(
 
     uint32_t qos_size;
     clear();
+    m_qos.data_sharing.off();
     try
     {
         if (ParameterList::readParameterListfromCDRMsg(*msg, param_process, true, qos_size))