backout _push run.join change

emberjs · Dec 6, 2016 · 120df47 · 120df47
1 parent 23a824b
commit 120df47
Showing 1 changed file with 25 additions and 25 deletions.
diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js
@@ -2277,39 +2277,37 @@ Store = Service.extend({
   */
   _push(apiDoc) {
     let token = heimdall.start('store._push');
-    return this._backburner.join(() => {
-      let included = apiDoc.included;
-      let i, length;
+    let included = apiDoc.included;
+    let i, length;
 
-      if (included) {
-        for (i = 0, length = included.length; i < length; i++) {
-          this._pushInternalModel(included[i]);
-        }
+    if (included) {
+      for (i = 0, length = included.length; i < length; i++) {
+        this._pushInternalModel(included[i]);
       }
+    }
 
-      if (Array.isArray(apiDoc.data)) {
-        length = apiDoc.data.length;
-        let internalModels = new Array(length);
+    if (Array.isArray(apiDoc.data)) {
+      length = apiDoc.data.length;
+      let internalModels = new Array(length);
 
-        for (i = 0; i < length; i++) {
-          internalModels[i] = this._pushInternalModel(apiDoc.data[i]);
-        }
-        heimdall.stop(token);
-        return internalModels;
+      for (i = 0; i < length; i++) {
+        internalModels[i] = this._pushInternalModel(apiDoc.data[i]);
       }
+      heimdall.stop(token);
+      return internalModels;
+    }
 
-      if (apiDoc.data === null) {
-        heimdall.stop(token);
-        return null;
-      }
+    if (apiDoc.data === null) {
+      heimdall.stop(token);
+      return null;
+    }
 
-      assert(`Expected an object in the 'data' property in a call to 'push' for ${apiDoc.type}, but was ${typeOf(apiDoc.data)}`, typeOf(apiDoc.data) === 'object');
+    assert(`Expected an object in the 'data' property in a call to 'push' for ${apiDoc.type}, but was ${typeOf(apiDoc.data)}`, typeOf(apiDoc.data) === 'object');
 
-      let internalModel = this._pushInternalModel(apiDoc.data);
+    let internalModel = this._pushInternalModel(apiDoc.data);
 
-      heimdall.stop(token);
-      return internalModel;
-    });
+    heimdall.stop(token);
+    return internalModel;
   },
 
   _hasModelFor(modelName) {
@@ -2350,7 +2348,9 @@ Store = Service.extend({
     // Actually load the record into the store.
     let internalModel = this._load(data);
 
-    this._setupRelationshipsForModel(internalModel, data);
+    this._backburner.join(() => {
+      this._setupRelationshipsForModel(internalModel, data);
+    });
 
     return internalModel;
   },