Merge pull request #8594 from AnalyticalGraphicsInc/fix-expiration

Fix expiration crash in case request is cancelled due to low priority
CesiumGS · Feb 6, 2020 · 1a84f21 · 1a84f21
2 parents 443db9c + 4aa8aa1
commit 1a84f21
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Source/Scene/Cesium3DTile.js b/Source/Scene/Cesium3DTile.js
@@ -842,10 +842,6 @@ import TileOrientedBoundingBox from './TileOrientedBoundingBox.js';
         this._contentReadyToProcessPromise = when.defer();
         this._contentReadyPromise = when.defer();
 
-        if (expired) {
-            this.expireDate = undefined;
-        }
-
         var contentFailedFunction = getContentFailedFunction(this, tileset);
         promise.then(function(arrayBuffer) {
             if (that.isDestroyed()) {
@@ -869,6 +865,10 @@ import TileOrientedBoundingBox from './TileOrientedBoundingBox.js';
                 that.hasTilesetContent = true;
             }
 
+            if (expired) {
+                that.expireDate = undefined;
+            }
+
             that._content = content;
             that._contentState = Cesium3DTileContentState.PROCESSING;
             that._contentReadyToProcessPromise.resolve(content);