From 7c5f7181ebb538d04586b9e088ce740db82c6320 Mon Sep 17 00:00:00 2001
From: hultonha <hultonha@amazon.co.uk>
Date: Thu, 15 Apr 2021 10:32:46 +0100
Subject: [PATCH] updates following review feedback - remove explicit resize
 and update concrete type to alias

---
 .../AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp | 4 ++--
 .../AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
index 09adaf38cb..6077a66682 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
@@ -31,10 +31,10 @@ namespace AZ
             switch (inputValue.GetType())
             {
             case rapidjson::kStringType: {
-                JsonByteStream* valAsByteStream = static_cast<JsonByteStream*>(outputValue);
-                JsonByteStream buffer(inputValue.GetStringLength());
+                JsonByteStream buffer;
                 if (AZ::StringFunc::Base64::Decode(buffer, inputValue.GetString(), inputValue.GetStringLength()))
                 {
+                    JsonByteStream* valAsByteStream = static_cast<JsonByteStream*>(outputValue);
                     *valAsByteStream = AZStd::move(buffer);
                     return context.Report(Tasks::ReadField, Outcomes::Success, "Successfully read ByteStream.");
                 }
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp
index e5a1f5e6bb..6e3c8cec60 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp
@@ -69,7 +69,7 @@ namespace AZ
             jsonContext->Serializer<JsonStringSerializer>()->HandlesType<AZStd::string>();
             jsonContext->Serializer<JsonOSStringSerializer>()->HandlesType<OSString>();
 
-            jsonContext->Serializer<JsonByteStreamSerializer>()->HandlesType<AZStd::vector<AZ::u8>>();
+            jsonContext->Serializer<JsonByteStreamSerializer>()->HandlesType<JsonByteStream>();
 
             jsonContext->Serializer<JsonBasicContainerSerializer>()
                 ->HandlesType<AZStd::fixed_vector>()