Structure DynamicType inheritance from TypeObject (#4712)

JLBuenoLopez · EduPonz · commit 8934b35688e9 · 2024-05-08T10:45:24.000+02:00
* Hotfix: Struct DynamicType inheritance from TypeObject

Signed-off-by: JLBuenoLopez-eProsima &lt;joseluisbueno@eprosima.com&gt;

* Apply review suggestion

Signed-off-by: JLBuenoLopez-eProsima &lt;joseluisbueno@eprosima.com&gt;

---------

Signed-off-by: JLBuenoLopez-eProsima &lt;joseluisbueno@eprosima.com&gt;
diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.cpp
@@ -607,22 +607,24 @@ traits<DynamicTypeBuilder>::ref_type DynamicTypeBuilderFactoryImpl::create_struc
     type_descriptor.extensibility_kind(struct_type.struct_flags() & xtypes::IS_FINAL ? ExtensibilityKind::FINAL :
             (struct_type.struct_flags() &
             xtypes::IS_MUTABLE ? ExtensibilityKind::MUTABLE : ExtensibilityKind::APPENDABLE));
-
-    ret_val = std::make_shared<DynamicTypeBuilderImpl>(type_descriptor);
-
+    bool inheritance_correct {true};
     if (xtypes::TK_NONE != struct_type.header().base_type()._d())
     {
         traits<DynamicType>::ref_type base_type = base_type_from_type_identifier(struct_type.header().base_type());
         if (base_type)
         {
-            ret_val->get_descriptor().base_type(base_type);
+            type_descriptor.base_type(base_type);
         }
         else
         {
             EPROSIMA_LOG_ERROR(DYN_TYPES, "Inconsistent base TypeIdentifier");
-            ret_val.reset();
+            inheritance_correct = false;
         }
     }
+    if (inheritance_correct)
+    {
+        ret_val = std::make_shared<DynamicTypeBuilderImpl>(type_descriptor);
+    }
 
     if (ret_val)
     {

Original file line number	Diff line number	Diff line change
`@@ -607,22 +607,24 @@ traits<DynamicTypeBuilder>::ref_type DynamicTypeBuilderFactoryImpl::create_struc`
`607`	`607`	`type_descriptor.extensibility_kind(struct_type.struct_flags() & xtypes::IS_FINAL ? ExtensibilityKind::FINAL :`
`608`	`608`	`(struct_type.struct_flags() &`
`609`	`609`	`xtypes::IS_MUTABLE ? ExtensibilityKind::MUTABLE : ExtensibilityKind::APPENDABLE));`
`610`		`-`
`611`		`- ret_val = std::make_shared<DynamicTypeBuilderImpl>(type_descriptor);`
`612`		`-`
	`610`	`+ bool inheritance_correct {true};`
`613`	`611`	`if (xtypes::TK_NONE != struct_type.header().base_type()._d())`
`614`	`612`	`{`
`615`	`613`	`traits<DynamicType>::ref_type base_type = base_type_from_type_identifier(struct_type.header().base_type());`
`616`	`614`	`if (base_type)`
`617`	`615`	`{`
`618`		`- ret_val->get_descriptor().base_type(base_type);`
	`616`	`+ type_descriptor.base_type(base_type);`
`619`	`617`	`}`
`620`	`618`	`else`
`621`	`619`	`{`
`622`	`620`	`EPROSIMA_LOG_ERROR(DYN_TYPES, "Inconsistent base TypeIdentifier");`
`623`		`- ret_val.reset();`
	`621`	`+ inheritance_correct = false;`
`624`	`622`	`}`
`625`	`623`	`}`
	`624`	`+ if (inheritance_correct)`
	`625`	`+ {`
	`626`	`+ ret_val = std::make_shared<DynamicTypeBuilderImpl>(type_descriptor);`
	`627`	`+ }`
`626`	`628`
`627`	`629`	`if (ret_val)`
`628`	`630`	`{`