Merge pull request #5467 from emberjs/fix-teardown

[BUGFIX] don't cause unnecessary work during destroy
emberjs · May 8, 2018 · 029fbfd · 029fbfd
2 parents 5b33009 + 07856f2
commit 029fbfd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js
@@ -1125,7 +1125,10 @@ Store = Service.extend({
 
   _internalModelDestroyed(internalModel) {
     this._removeFromIdMap(internalModel);
-    this._relationshipsPayloads.unload(internalModel.modelName, internalModel.id);
+
+    if (!this.isDestroying) {
+      this._relationshipsPayloads.unload(internalModel.modelName, internalModel.id);
+    }
   },
 
   /**
@@ -2625,6 +2628,7 @@ Store = Service.extend({
     this._pushedInternalModels = null;
     this.recordArrayManager.destroy();
 
+    this._relationshipsPayloads = null;
     this._adapterCache = null;
     this._serializerCache = null;