commit a95dfdb274378fa50456fb05fd2c3fa1dbc09d53
author Sen Jiang <senj@google.com> Wed Mar 07 00:45:29 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 07 00:45:29 2018 +0000
tree d81cb22e470494abfc8bbc84bdef1413d0983647
parent 8679c142bbbc58c1ac20c1fbef14641fc3cdc049
parent 742419945993c362979859c9c367744a1744612a

Avoid terminating MultiRangeHttpFetcher twice.
am: 7424199459

Change-Id: Ie9cb585200e10c8c68866b53ef7f5a020c892c41

common/multi_range_http_fetcher.cc

diff --git a/common/multi_range_http_fetcher.cc b/common/multi_range_http_fetcher.cc
index 1189fde..dc4b7c1 100644
--- a/common/multi_range_http_fetcher.cc
+++ b/common/multi_range_http_fetcher.cc
@@ -101,6 +101,12 @@
   LOG_IF(WARNING, next_size <= 0) << "Asked to write length <= 0";
   if (delegate_) {
     delegate_->ReceivedBytes(this, bytes, next_size);
+    // If the transfer was already terminated by |delegate_|, return immediately
+    // to avoid calling TerminateTransfer() again.
+    if (!base_fetcher_active_) {
+      LOG(INFO) << "Delegate has terminated the transfer.";
+      return;
+    }
   }
   bytes_received_this_range_ += length;
   if (range.HasLength() && bytes_received_this_range_ >= range.length()) {