From 638f40b7dd23bbb07c268291a3b0c6233fe55ec2 Mon Sep 17 00:00:00 2001
From: jonawals <jonawals@amazon.com>
Date: Fri, 21 May 2021 12:19:19 +0100
Subject: [PATCH] Add proper exhange to payload release

---
 .../Code/Source/Process/JobRunner/TestImpactProcessJob.h   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJob.h b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJob.h
index f1629adda4..47afe1ca3e 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJob.h
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJob.h
@@ -38,7 +38,8 @@ namespace TestImpact
         const AZStd::optional<Payload>& GetPayload() const;
 
         //! Facilitates the client consuming the payload.
-        AZStd::optional<Payload>&& ReleasePayload();
+        //! @note It is valid for a job life cycle to continue after having released its payload.
+        AZStd::optional<Payload> ReleasePayload();
 
     private:
         Info m_jobInfo;
@@ -66,8 +67,8 @@ namespace TestImpact
     }
 
     template<typename JobInfoT, typename JobPayloadT>
-    AZStd::optional<JobPayloadT>&& Job<JobInfoT, JobPayloadT>::ReleasePayload()
+    AZStd::optional<JobPayloadT> Job<JobInfoT, JobPayloadT>::ReleasePayload()
     {
-        return AZStd::move(m_payload);
+        return AZStd::exchange(m_payload, AZStd::nullopt);
     }
 } // namespace TestImpact