Merge pull request #79 from awslabs/FB-DownloadStream

Fb download stream

Author: JonathanHenson

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

@@ -146,6 +146,8 @@ namespace Aws
              */
             TransferHandle(const Aws::String& bucketName, const Aws::String& keyName, CreateDownloadStreamCallback createDownloadStreamFn);
 
+            ~TransferHandle();
+
             /**
              * Whether or not this transfer is being performed using parallel parts via a multi-part s3 api.
              */
@@ -328,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

@@ -111,6 +111,11 @@ namespace Aws
             m_downloadStream(nullptr)
         {}
 
+        TransferHandle::~TransferHandle()
+        {
+            CleanupDownloadStream();
+        }
+
         void TransferHandle::ChangePartToCompleted(const PartPointer& partState, const Aws::String &eTag)
         {
             std::lock_guard<std::mutex> locker(m_partsLock);
@@ -228,6 +233,11 @@ namespace Aws
 
                 if (IsFinishedStatus(value))
                 {
+                    if(value == TransferStatus::COMPLETED)
+                    {
+                        CleanupDownloadStream();
+                    }
+
                     std::unique_lock<std::mutex> semaphoreLock(m_statusLock);
                     m_waitUntilFinishedSignal.notify_all();
                 }
@@ -280,5 +290,15 @@ namespace Aws
         {
             SetVersionId(downloadConfig.versionId);
         }
+
+        void TransferHandle::CleanupDownloadStream()
+        {
+            if(m_downloadStream)
+            {
+                m_downloadStream->flush();
+                Aws::Delete(m_downloadStream);
+                m_downloadStream = nullptr;
+            }
+        }
     }
 }