[BUGFIX] dont cause unnecessary work during destroy

(cherry picked from commit 07856f2)
emberjs · Jun 13, 2018 · 88191eb · 88191eb
1 parent 3f6ecdc
commit 88191eb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js
@@ -1152,7 +1152,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);
+    }
   },
 
   /**
@@ -2726,6 +2729,7 @@ Store = Service.extend({
     this._pushedInternalModels = null;
     this.recordArrayManager.destroy();
 
+    this._relationshipsPayloads = null;
     this._adapterCache = null;
     this._serializerCache = null;