Refs #22202. TMP: will it pass?

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

Author: juanlofer-eprosima

src/cpp/fastdds/xtypes/serializers/json/dynamic_data_json.cpp

@@ -582,12 +582,12 @@ ReturnCode_t json_serialize_enum_member(
         enum_type = traits<DynamicType>::narrow<DynamicTypeImpl>(enum_desc->type())->resolve_alias_enclosed_type();
     }
 
-    if (nullptr == enum_type)
-    {
-        EPROSIMA_LOG_ERROR(XTYPES_UTILS,
-                "Error encountered while serializing TK_ENUM member to JSON: null enum type.");
-        return RETCODE_BAD_PARAMETER;
-    }
+    // if (nullptr == enum_type)
+    // {
+    //     EPROSIMA_LOG_ERROR(XTYPES_UTILS,
+    //             "Error encountered while serializing TK_ENUM member to JSON: null enum type.");
+    //     return RETCODE_BAD_PARAMETER;
+    // }
 
     // Get value depending on the enclosing type
     assert(enum_type->get_kind() == TK_ENUM);
@@ -597,6 +597,12 @@ ReturnCode_t json_serialize_enum_member(
     auto enum_desc = enum_members.at(0)->get_descriptor();
     auto enum_member_type = enum_desc.type();
     auto enum_member_type_impl = traits<DynamicType>::narrow<DynamicTypeImpl>(enum_member_type);
+    if (nullptr == enum_member_type_impl)
+    {
+        EPROSIMA_LOG_ERROR(XTYPES_UTILS,
+                "Error encountered while serializing TK_ENUM member to JSON: null enum member type.");
+        return RETCODE_BAD_PARAMETER;
+    }
     TypeKind enclosing_kind = enum_member_type_impl->get_kind();
     nlohmann::json j_value;
     if (TK_INT8 == enclosing_kind)

src/cpp/fastdds/xtypes/serializers/json/json_dynamic_data.cpp

@@ -677,17 +677,28 @@ ReturnCode_t json_deserialize_enum_member(
         enum_type = traits<DynamicType>::narrow<DynamicTypeImpl>(enum_desc->type())->resolve_alias_enclosed_type();
     }
 
-    if (nullptr == enum_type)
+    // if (nullptr == enum_type)
+    // {
+    //     EPROSIMA_LOG_ERROR(XTYPES_UTILS,
+    //             "Error encountered while deserializing TK_ENUM member from JSON: null enum type.");
+    //     return RETCODE_BAD_PARAMETER;
+    // }
+
+    // Get enclosing type kind to parse the value accordingly, and later user the appropriate setter
+    assert(enum_type->get_kind() == TK_ENUM);
+    // TypeKind enclosing_kind = traits<DynamicType>::narrow<DynamicTypeImpl>(enum_type->get_all_members_by_index().at(
+    //                     0)->get_descriptor().type())->get_kind(); // Unfortunately DynamicDataImpl::get_enclosing_typekind is private
+    auto enum_members = enum_type->get_all_members_by_index();
+    auto enum_desc = enum_members.at(0)->get_descriptor();
+    auto enum_member_type = enum_desc.type();
+    auto enum_member_type_impl = traits<DynamicType>::narrow<DynamicTypeImpl>(enum_member_type);
+    if (nullptr == enum_member_type_impl)
     {
         EPROSIMA_LOG_ERROR(XTYPES_UTILS,
-                "Error encountered while deserializing TK_ENUM member from JSON: null enum type.");
+                "Error encountered while deserializing TK_ENUM member from JSON: null enum member type.");
         return RETCODE_BAD_PARAMETER;
     }
-
-    // Get enclosing type kind to parse the value accordingly, and later user the appropriate setter
-    assert(enum_type->get_kind() == TK_ENUM);
-    TypeKind enclosing_kind = traits<DynamicType>::narrow<DynamicTypeImpl>(enum_type->get_all_members_by_index().at(
-                        0)->get_descriptor().type())->get_kind(); // Unfortunately DynamicDataImpl::get_enclosing_typekind is private
+    TypeKind enclosing_kind = enum_member_type_impl->get_kind();
 
     if (DynamicDataJsonFormat::OMG == format)
     {