From 0884f96997ab18916b4b83ce01f167eb75d1eea6 Mon Sep 17 00:00:00 2001
From: mnaumov <mnaumov@amazon.com>
Date: Mon, 16 Aug 2021 16:00:18 -0700
Subject: [PATCH] PR feedback

Signed-off-by: mnaumov <mnaumov@amazon.com>
---
 .../AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp | 6 +++---
 .../AzToolsFramework/Prefab/PrefabDomUtils.cpp              | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp
index af42919637..92b37b10db 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp
@@ -82,13 +82,13 @@ namespace AzToolsFramework
                 result.Combine(resultInstances);
             }
 
-            PrefabDomUtils::LinkIdMetadata** linkIdMetadata = context.GetMetadata().Find<PrefabDomUtils::LinkIdMetadata*>();
-            if (linkIdMetadata && *linkIdMetadata)
+            PrefabDomUtils::LinkIdMetadata* subPathLinkId = context.GetMetadata().Find<PrefabDomUtils::LinkIdMetadata>();
+            if (subPathLinkId)
             {
                 AZ::ScopedContextPath subPathSource(context, "m_linkId");
 
                 result = ContinueStoringToJsonObjectField(
-                    outputValue, "LinkId", &(instance->m_linkId), &InvalidLinkId, azrtti_typeid<AZ::u64>(), context);
+                    outputValue, "LinkId", &(instance->m_linkId), &InvalidLinkId, azrtti_typeid<decltype(instance->m_linkId)>(), context);
             }
 
             return context.Report(result,
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp
index 2462bc0348..dcc14d3b91 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp
@@ -90,8 +90,7 @@ namespace AzToolsFramework
 
                 if ((flags & StoreFlags::StoreLinkIds) != StoreFlags::None)
                 {
-                    LinkIdMetadata linkIdMetadata;
-                    settings.m_metadata.Add(&linkIdMetadata);
+                    settings.m_metadata.Create<LinkIdMetadata>();
                 }
 
                 AZStd::string scratchBuffer;