Merge pull request #4913 from runspired/fix/container-destroy

[BUGFIX canary] don't prematurely nullify props
emberjs · Apr 5, 2017 · d9d6448 · d9d6448
2 parents 33f0ced + c2dbde3
commit d9d6448
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/addon/-private/system/store/container-instance-cache.js b/addon/-private/system/store/container-instance-cache.js
@@ -33,6 +33,8 @@ const  {
 */
 export default class ContainerInstanceCache {
   constructor(owner, store) {
+    this.isDestroying = false;
+    this.isDestroyed = false;
     this._owner = owner;
     this._store = store;
     this._namespaces = {
@@ -111,11 +113,10 @@ export default class ContainerInstanceCache {
   }
 
   destroy() {
+    this.isDestroying = true;
     this.destroyCache(this._namespaces.adapter);
     this.destroyCache(this._namespaces.serializer);
-    this._namespaces = null;
-    this._store = null;
-    this._owner = null;
+    this.isDestroyed = true;
   }
 
   toString() {