More fixes for loadXXX retry logic.

CesiumGS · Jan 19, 2018 · fe92f99 · fe92f99
1 parent 508a22b
commit fe92f99
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 31 deletions.
diff --git a/Source/Core/loadImage.js b/Source/Core/loadImage.js
@@ -106,16 +106,20 @@ define([
 
         return promise
             .otherwise(function(e) {
+                //Don't retry cancelled or otherwise aborted requests
+                if (request.state !== RequestState.FAILED) {
+                    return when.reject(e);
+                }
+
                 return resource.retryOnError(e)
                     .then(function(retry) {
                         if (retry) {
                             // Reset request so it can try again
                             request.state = RequestState.UNISSUED;
                             request.deferred = undefined;
 
-                            return makeRequest(resource);
+                            return makeRequest(resource, allowCrossOrigin);
                         }
-
                         return when.reject(e);
                     });
             });

diff --git a/Source/Core/loadJsonp.js b/Source/Core/loadJsonp.js
@@ -123,22 +123,21 @@ define([
 
         return promise
             .otherwise(function(e) {
-                if (request.state === RequestState.FAILED) {
-                    return resource.retryOnError(e)
-                        .then(function(retry) {
-                            if (retry) {
-                                // Reset request so it can try again
-                                request.state = RequestState.UNISSUED;
-                                request.deferred = undefined;
-
-                                return makeRequest(resource, callbackParameterName, functionName);
-                            }
-
-                            return when.reject(e);
-                        });
+                if (request.state !== RequestState.FAILED) {
+                    return when.reject(e);
                 }
-
-                return when.reject(e);
+                return resource.retryOnError(e)
+                    .then(function(retry) {
+                        if (retry) {
+                            // Reset request so it can try again
+                            request.state = RequestState.UNISSUED;
+                            request.deferred = undefined;
+
+                            return makeRequest(resource, callbackParameterName, functionName);
+                        }
+
+                        return when.reject(e);
+                    });
             });
     }
 

diff --git a/Source/Core/loadWithXhr.js b/Source/Core/loadWithXhr.js
@@ -114,22 +114,22 @@ define([
                 return data;
             })
             .otherwise(function(e) {
-                if ((request.state === RequestState.FAILED) && defined(optionsOrResource.retryOnError)) {
-                    return optionsOrResource.retryOnError(e)
-                        .then(function(retry) {
-                            if (retry) {
-                                // Reset request so it can try again
-                                request.state = RequestState.UNISSUED;
-                                request.deferred = undefined;
-
-                                return makeRequest(optionsOrResource);
-                            }
-
-                            return when.reject(e);
-                        });
+                if ((request.state !== RequestState.FAILED) || !defined(optionsOrResource.retryOnError)) {
+                    return when.reject(e);
                 }
 
-                return when.reject(e);
+                return optionsOrResource.retryOnError(e)
+                    .then(function(retry) {
+                        if (retry) {
+                            // Reset request so it can try again
+                            request.state = RequestState.UNISSUED;
+                            request.deferred = undefined;
+
+                            return makeRequest(optionsOrResource);
+                        }
+
+                        return when.reject(e);
+                    });
             });
     }