Refs #21733. Fix early deserialization abortion

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
eProsima · Oct 1, 2024 · 78cc9b1 · 78cc9b1
1 parent 37d419a
commit 78cc9b1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicDataImpl.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicDataImpl.cpp
@@ -6479,7 +6479,12 @@ bool DynamicDataImpl::deserialize(
                                         if (MEMBER_ID_INVALID == selected_union_member_)
                                         {
                                             selected_union_member_ = type->default_union_member();
-                                            ret_value = false;
+
+                                            // Check again after attempting to assign the default member
+                                            if (MEMBER_ID_INVALID == selected_union_member_)
+                                            {
+                                                ret_value = false;
+                                            }
                                         }
                                     }
                                     else