Centralize stream cleanup

Author: Bret Ambrose

aws-cpp-sdk-transfer/include/aws/transfer/TransferHandle.h

@@ -330,6 +330,8 @@ namespace Aws
 
         private:
 
+            void CleanupDownloadStream();
+
             bool m_isMultipart;
             Aws::String m_multipartId;
             TransferDirection m_direction;

aws-cpp-sdk-transfer/source/transfer/TransferHandle.cpp

@@ -113,11 +113,7 @@ namespace Aws
 
         TransferHandle::~TransferHandle()
         {
-            if(m_downloadStream)
-            {
-                Aws::Delete(m_downloadStream);
-                m_downloadStream = nullptr;
-            }
+            CleanupDownloadStream();
         }
 
         void TransferHandle::ChangePartToCompleted(const PartPointer& partState, const Aws::String &eTag)
@@ -237,11 +233,9 @@ namespace Aws
 
                 if (IsFinishedStatus(value))
                 {
-                    if(m_downloadStream && value == TransferStatus::COMPLETED)
+                    if(value == TransferStatus::COMPLETED)
                     {
-                        m_downloadStream->flush();
-                        Aws::Delete(m_downloadStream);
-                        m_downloadStream = nullptr;
+                        CleanupDownloadStream();
                     }
 
                     std::unique_lock<std::mutex> semaphoreLock(m_statusLock);
@@ -296,5 +290,15 @@ namespace Aws
         {
             SetVersionId(downloadConfig.versionId);
         }
+
+        void TransferHandle::CleanupDownloadStream()
+        {
+            if(m_downloadStream)
+            {
+                m_downloadStream->flush();
+                Aws::Delete(m_downloadStream);
+                m_downloadStream = nullptr;
+            }
+        }
     }
 }