birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ronald's feedback

Browse Source 
Co-authored-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
This commit is contained in:
Mikhail Naumov
2021-08-23 13:01:37 -07:00
committed by Mikhail Naumov
parent 875918deda
commit f224d657be
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp
+10 -12
View File
@@ -571,25 +571,23 @@ namespace AZ
if (loadedTypeId.m_determination == TypeIdDetermination::FailedToDetermine ||
loadedTypeId.m_determination == TypeIdDetermination::FailedDueToMultipleTypeIds)
{
AZStd::string message;
if (loadedTypeId.m_determination == TypeIdDetermination::FailedDueToMultipleTypeIds)
{
message = "Unable to resolve provided type because the same name points to multiple types.";
}
else
{
auto typeField = pointerData.FindMember(JsonSerialization::TypeIdFieldIdentifier);
if (typeField != pointerData.MemberEnd() && typeField->value.IsString())
{
message = AZStd::string::format("Unable to resolve provided type: %s.", typeField->value.GetString());
const char* format = loadedTypeId.m_determination == TypeIdDetermination::FailedToDetermine ?
"Unable to resolve provided type: %.*s." :
"Unable to resolve provided type %.*s because the same name points to multiple types.";
status = context.Report(Tasks::RetrieveInfo, Outcomes::Unknown,
AZStd::string::format("Unable to resolve provided type: %.*s.", typeField->value.GetStringLength(), typeField->value.GetString()));
}
else
{
message = "Unable to resolve provided type.";
const char* message = loadedTypeId.m_determination == TypeIdDetermination::FailedToDetermine ?
"Unable to resolve provided type." :
"Unable to resolve provided type because the same name points to multiple types."
status = context.Report(Tasks::RetrieveInfo, Outcomes::Unknown, "Unable to resolve provided type.");
}
}
status = context.Report(Tasks::RetrieveInfo, Outcomes::Unknown, message);
return ResolvePointerResult::FullyProcessed;
return ResolvePointerResult::FullyProcessed;
}
if (loadedTypeId.m_typeId != objectType)