Correct operator= for UserData and Partitions

eProsima · Feb 10, 2020 · 8e87789 · 8e87789
1 parent de0f4e7
commit 8e87789
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/include/fastrtps/qos/QosPolicies.h b/include/fastrtps/qos/QosPolicies.h
@@ -688,9 +688,13 @@ class UserDataQosPolicy : public Parameter_t, public QosPolicy, public ResourceL
     UserDataQosPolicy& operator =(
             const collection_type& b)
     {
-        //If the object is size limited, already has max_size() allocated
-        //assign() will always stop copying when reaching max_size()
-        assign(b.begin(), b.end());
+        if (collection_ != b)
+        {
+            //If the object is size limited, already has max_size() allocated
+            //assign() will always stop copying when reaching max_size()
+            assign(b.begin(), b.end());
+            hasChanged = true;
+        }
         return *this;
     }
 
@@ -1119,7 +1123,8 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy
     PartitionQosPolicy& operator =(
             const PartitionQosPolicy& b)
     {
-        length = b.length;
+        QosPolicy::operator=(b);
+        Parameter_t::operator=(b);
         max_size_ = b.max_size_;
         partitions_.reserve(max_size_ != 0 ?
                 b.partitions_.max_size :

diff --git a/test/mock/rtps/QosPolicies/fastrtps/qos/QosPolicies.h b/test/mock/rtps/QosPolicies/fastrtps/qos/QosPolicies.h
@@ -609,7 +609,11 @@ class UserDataQosPolicy : public Parameter_t, public QosPolicy, public ResourceL
     UserDataQosPolicy& operator =(
             const collection_type& b)
     {
-        assign(b.begin(), b.end());
+        if (collection_ != b)
+        {
+            assign(b.begin(), b.end());
+            hasChanged = true;
+        }
         return *this;
     }