From 86a6d75b40362b287cf8e7dbe28c14f98aa17f2b Mon Sep 17 00:00:00 2001 From: srikappa Date: Mon, 12 Jul 2021 15:01:11 -0700 Subject: [PATCH] Remove an additional check during patch application to report errors Signed-off-by: srikappa --- .../AzCore/AzCore/Serialization/Json/JsonMerger.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp index 51e47840c9..61869b7eb5 100644 --- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp +++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp @@ -110,15 +110,7 @@ namespace AZ if (result.GetProcessing() == Processing::Halted) { - ResultCode reportedResult = settings.m_reporting(R"(One of the patches couldn't be applied correctly.)", result, element); - if (reportedResult.GetOutcome() == Outcomes::PartialSkip) - { - result = reportedResult; - } - else - { - return result; - } + return result; } }