From f224d657be4380bffe41c249c537f3f6b6e94415 Mon Sep 17 00:00:00 2001 From: Mikhail Naumov <82239319+AMZN-mnaumov@users.noreply.github.com> Date: Mon, 23 Aug 2021 13:01:37 -0700 Subject: [PATCH] Ronald's feedback Co-authored-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com> Signed-off-by: Mikhail Naumov --- .../Serialization/Json/JsonDeserializer.cpp | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp index c1ffb774e8..5f90744607 100644 --- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp +++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp @@ -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)