AmazonWebServiceRequest - RetryContext to be private, and contain a pointer to the request hash pair

Author: sbaluja

src/aws-cpp-sdk-core/include/aws/core/AmazonWebServiceRequest.h

@@ -36,7 +36,7 @@ namespace Aws
     typedef std::function<void(const Aws::Http::HttpRequest&)> RequestSignedHandler;
 
     struct RetryContext {
-      std::pair<Aws::String, std::shared_ptr<Aws::Utils::Crypto::Hash>> m_requestHash;
+      std::shared_ptr<std::pair<Aws::String, std::shared_ptr<Aws::Utils::Crypto::Hash>>> m_requestHash = nullptr;
     };
 
     /**
@@ -228,7 +228,9 @@ namespace Aws
 
         inline virtual bool RequestChecksumRequired() const { return false; }
 
-        mutable Aws::RetryContext m_retryContext;
+        RetryContext GetRetryContext() const { return m_retryContext; }
+
+        void SetRetryContext(const RetryContext& context) const { m_retryContext = context; }
     protected:
         /**
          * Default does nothing. Override this to convert what would otherwise be the payload of the
@@ -248,6 +250,7 @@ namespace Aws
         RequestRetryHandler m_requestRetryHandler;
         mutable std::shared_ptr<Aws::Http::ServiceSpecificParameters> m_serviceSpecificParameters;
         mutable Aws::Set<Client::UserAgentFeature> m_userAgentFeatures;
+        mutable Aws::RetryContext m_retryContext;
     };
 
 } // namespace Aws

src/aws-cpp-sdk-core/source/client/AWSClient.cpp

@@ -391,9 +391,13 @@ HttpResponseOutcome AWSClient::AttemptExhaustively(const Aws::Http::URI& uri,
         }
 
         // Save checksum information from the original request if we haven't already - safe to assume that the checksum has been finalized, since we have sent and received a response
-        if (request.m_retryContext.m_requestHash.second == nullptr) {
+        RetryContext context = request.GetRetryContext();
+        if (context.m_requestHash == nullptr) {
           auto originalRequestHash = httpRequest->GetRequestHash();
-          request.m_retryContext.m_requestHash = originalRequestHash;
+          if (originalRequestHash.second != nullptr) {
+            context.m_requestHash = Aws::MakeShared<std::pair<Aws::String, std::shared_ptr<Aws::Utils::Crypto::Hash>>>(AWS_CLIENT_LOG_TAG, originalRequestHash);
+            request.SetRetryContext(context);
+          }
         }
 
         httpRequest = CreateHttpRequest(newUri, method, request.GetResponseStreamFactory());
@@ -929,9 +933,10 @@ void AWSClient::BuildHttpRequest(const Aws::AmazonWebServiceRequest& request, co
     request.AddQueryStringParameters(httpRequest->GetUri());
 
     // check for retry context, if present use it
-    if (request.m_retryContext.m_requestHash.second != nullptr) {
-      const auto hash = Aws::MakeShared<Aws::Utils::Crypto::PrecalculatedHash>(smithy::client::AWS_SMITHY_CLIENT_CHECKSUM, HashingUtils::Base64Encode(request.m_retryContext.m_requestHash.second->GetHash().GetResult()));
-      httpRequest->SetRequestHash(request.m_retryContext.m_requestHash.first, hash);
+    RetryContext context = request.GetRetryContext();
+    if (context.m_requestHash != nullptr) {
+      const auto hash = Aws::MakeShared<Aws::Utils::Crypto::PrecalculatedHash>(smithy::client::AWS_SMITHY_CLIENT_CHECKSUM, HashingUtils::Base64Encode(context.m_requestHash->second->GetHash().GetResult()));
+      httpRequest->SetRequestHash(context.m_requestHash->first, hash);
     }
 }