Add check if an operation was cancelled (#1338)

dudnyk · web-flow · commit 6ae2ab2d1732 · 2022-06-10T14:31:48.000+03:00
Add check if the pointer exists to prevent calling
OnPrefetchCompletedin in case an operation is cancelled.

Relates-To: OLPEDGE-2746

Signed-off-by: Yevhenii Dudnyk &lt;ext-yevhenii.dudnyk@here.com&gt;
diff --git a/olp-cpp-sdk-dataservice-read/src/DownloadItemsJob.h b/olp-cpp-sdk-dataservice-read/src/DownloadItemsJob.h
@@ -89,7 +89,7 @@ class DownloadItemsJob {
           user_callback_) {
         auto user_callback = std::move(user_callback_);
         if (user_callback) {
-          user_callback({{client::ErrorCode::Cancelled, "Cancelled"}});
+          user_callback(client::ApiError::Cancelled());
         }
         return;
       }
@@ -105,7 +105,7 @@ class DownloadItemsJob {
           GetAccumulatedBytes(accumulated_statistics_)});
     }
 
-    if (!--download_task_count_) {
+    if (!--download_task_count_ && user_callback_) {
       OLP_SDK_LOG_DEBUG_F("DownloadItemsJob",
                           "Download complete, succeeded=%zu, failed=%zu",
                           requests_succeeded_, requests_failed_);

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ class DownloadItemsJob {`
`89`	`89`	`user_callback_) {`
`90`	`90`	`auto user_callback = std::move(user_callback_);`
`91`	`91`	`if (user_callback) {`
`92`		`- user_callback({{client::ErrorCode::Cancelled, "Cancelled"}});`
	`92`	`+ user_callback(client::ApiError::Cancelled());`
`93`	`93`	`}`
`94`	`94`	`return;`
`95`	`95`	`}`
`@@ -105,7 +105,7 @@ class DownloadItemsJob {`
`105`	`105`	`GetAccumulatedBytes(accumulated_statistics_)});`
`106`	`106`	`}`
`107`	`107`
`108`		`- if (!--download_task_count_) {`
	`108`	`+ if (!--download_task_count_ && user_callback_) {`
`109`	`109`	`OLP_SDK_LOG_DEBUG_F("DownloadItemsJob",`
`110`	`110`	`"Download complete, succeeded=%zu, failed=%zu",`
`111`	`111`	`requests_succeeded_, requests_failed_);`