From c12f18df2733f36819d482ad1c8b7152a5450584 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Thu, 24 Mar 2016 14:35:46 -0700
Subject: [PATCH] [courier/fetch] detect aborted requests more agressively

---
 src/ui/public/courier/fetch/fetch_these.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/ui/public/courier/fetch/fetch_these.js b/src/ui/public/courier/fetch/fetch_these.js
index 78affdf29ac5..27b0c3cc1e36 100644
--- a/src/ui/public/courier/fetch/fetch_these.js
+++ b/src/ui/public/courier/fetch/fetch_these.js
@@ -29,22 +29,26 @@ export default function FetchTheseProvider(Private, Promise) {
   }
 
   function fetchWithStrategy(strategy, requests) {
+    function replaceAbortedRequests() {
+      requests = requests.map(r => r.aborted ? ABORTED : r);
+    }
 
-    requests = requests.map(function (req) {
-      return req.aborted ? ABORTED : req;
-    });
-
+    replaceAbortedRequests();
     return startRequests(requests)
     .then(function () {
+      replaceAbortedRequests();
       return callClient(strategy, requests);
     })
     .then(function (responses) {
+      replaceAbortedRequests();
       return callResponseHandlers(requests, responses);
     })
     .then(function (responses) {
+      replaceAbortedRequests();
       return continueIncomplete(strategy, requests, responses, fetchWithStrategy);
     })
     .then(function (responses) {
+      replaceAbortedRequests();
       return responses.map(function (resp) {
         switch (resp) {
           case ABORTED: