chore: address PR comment

philips-software · Dec 2, 2024 · 4fd47c4 · 4fd47c4
1 parent 518e315
commit 4fd47c4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/services/network/HttpClientImpl.cpp b/services/network/HttpClientImpl.cpp
@@ -223,15 +223,19 @@ namespace services
             {
                 bodyReader.Emplace(ConnectionObserver::Subject().ReceiveStream(), *contentLength);
                 auto reader = infra::MakeContainedSharedObject(bodyReader->countingReader, bodyReaderAccess.MakeShared(bodyReader));
-                BodyReaderAvailable(reader);
+                BodyReaderAvailable(std::move(reader));
 
-                if (HttpClient::IsAttached())
-                    Observer().BodyAvailable(std::move(reader));
                 repeat = chunkedEncoding && contentLength == 0;
             }
         }
     }
 
+    void HttpClientImpl::BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding>&& bodyReader)
+    {
+        if (HttpClient::IsAttached())
+            Observer().BodyAvailable(std::move(bodyReader));
+    }
+
     void HttpClientImpl::BodyReaderDestroyed()
     {
         ConnectionObserver::Subject().AckReceived();

diff --git a/services/network/HttpClientImpl.hpp b/services/network/HttpClientImpl.hpp
@@ -55,7 +55,7 @@ namespace services
         void BodyComplete();
 
     protected:
-        virtual void BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding> bodyReader){};
+        virtual void BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding>&& bodyReader);
 
     private:
         void ExpectResponse();

diff --git a/services/network/TracingHttpClientImpl.cpp b/services/network/TracingHttpClientImpl.cpp
@@ -7,7 +7,7 @@ namespace services
         , tracer(tracer)
     {}
 
-    void TracingHttpClientImpl::BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding> bodyReader)
+    void TracingHttpClientImpl::BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding>&& bodyReader)
     {
         tracer.Trace() << "HttpClientImpl::BodyAvailable; received response:" << infra::endl;
 
@@ -18,7 +18,7 @@ namespace services
             tracer.Trace() << infra::ByteRangeAsString(stream.ContiguousRange());
 
         reader->Rewind(marker);
-        reader = nullptr;
+        HttpClientImpl::BodyReaderAvailable(std::move(reader));
     }
 
     void TracingHttpClientImpl::Attached()
@@ -54,7 +54,7 @@ namespace services
         , tracer(tracer)
     {}
 
-    void TracingHttpClientImplWithRedirection::BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding> bodyReader)
+    void TracingHttpClientImplWithRedirection::BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding>&& bodyReader)
     {
         tracer.Trace() << "HttpClientImplWithRedirection::BodyAvailable; received response:" << infra::endl;
 
@@ -65,7 +65,7 @@ namespace services
             tracer.Trace() << infra::ByteRangeAsString(stream.ContiguousRange());
 
         reader->Rewind(marker);
-        reader = nullptr;
+        HttpClientImplWithRedirection::BodyReaderAvailable(std::move(reader));
     }
 
     void TracingHttpClientImplWithRedirection::Attached()

diff --git a/services/network/TracingHttpClientImpl.hpp b/services/network/TracingHttpClientImpl.hpp
@@ -21,7 +21,7 @@ namespace services
 
     protected:
         // Implementation of HttpClientImplWithRedirection
-        void BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding> bodyReader) override;
+        void BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding>&& bodyReader) override;
 
     private:
         class TracingWriter
@@ -61,7 +61,7 @@ namespace services
 
     protected:
         // Implementation of HttpClientImplWithRedirection
-        void BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding> bodyReader) override;
+        void BodyReaderAvailable(infra::SharedPtr<infra::CountingStreamReaderWithRewinding>&& bodyReader) override;
 
     private:
         class TracingWriter