include original request message in the response container, necessary…

… if its contents need to be read as the HttpClient disposes automatically after sending (see https://github.com/dotnet/corefx/issues/1794)
marcinjakubowski · Apr 21, 2017 · 2b2a508 · 2b2a508
1 parent afc8a9f
commit 2b2a508
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ScraperClientLib/Engine/ClientBase.cs b/ScraperClientLib/Engine/ClientBase.cs
@@ -113,13 +113,16 @@ public HttpRequestMessage BuildPost(Uri uri, IEnumerable<KeyValuePair<string, st
 
         private ResponseContainer IssueRequestInternal(HttpRequestMessage request, bool save = true)
         {
-            if (save && _retry == 0) _original = CloneHttpRequestMessage(request);
+            if (save && _retry == 0)
+            {
+                _original = CloneHttpRequestMessage(request);
+            }
             try
             {
                 HttpResponseMessage response = _httpClient.SendAsync(request).Sync();
                 LastRequestUtc = DateTime.UtcNow;
 
-                ResponseContainer result = new ResponseContainer(request, response);
+                ResponseContainer result = new ResponseContainer(request, _original, response);
                 _retry = 0;
                 return result;
             }

diff --git a/ScraperClientLib/Engine/ResponseContainer.cs b/ScraperClientLib/Engine/ResponseContainer.cs
@@ -13,7 +13,7 @@ namespace ScraperClientLib.Engine
     public class ResponseContainer
     {
         public HttpRequestMessage RequestMessage { get; }
-
+        public HttpRequestMessage OriginalRequest { get; }
         public HttpResponseMessage ResponseMessage { get; }
         public Lazy<string> Raw { get; }
 
@@ -29,9 +29,10 @@ public class ResponseContainer
 
         public List<DataObject> ParsedObjects { get; set; }
 
-        public ResponseContainer(HttpRequestMessage requestMessage, HttpResponseMessage responseMessage)
+        public ResponseContainer(HttpRequestMessage requestMessage, HttpRequestMessage originalRequest, HttpResponseMessage responseMessage)
         {
             RequestMessage = requestMessage;
+            OriginalRequest = originalRequest;
             ResponseMessage = responseMessage;
 
             ParsedObjects = new List<DataObject>();