Merge pull request #3844 from bmac/bug-3629

Remove conditional statement that is always true
emberjs · Oct 16, 2015 · 188efdd · 188efdd
2 parents 921e8c9 + 2913065
commit 188efdd
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/packages/ember-data/lib/adapters/rest-adapter.js b/packages/ember-data/lib/adapters/rest-adapter.js
@@ -816,15 +816,12 @@ export default Adapter.extend(BuildURLMixin, {
       var hash = adapter.ajaxOptions(url, type, options);
 
       hash.success = function(payload, textStatus, jqXHR) {
-        let response;
-
-        if (!(response instanceof AdapterError)) {
-          response = adapter.handleResponse(
-            jqXHR.status,
-            parseResponseHeaders(jqXHR.getAllResponseHeaders()),
-            response || payload
-          );
-        }
+
+        let response = adapter.handleResponse(
+          jqXHR.status,
+          parseResponseHeaders(jqXHR.getAllResponseHeaders()),
+          payload
+        );
 
         if (response instanceof AdapterError) {
           Ember.run(null, reject, response);