We shouldn't be doing this.

The LRU will sever ties to the shifted object, it's up to the rest of the app to release it.

Revert "Destroying objects that get shifted out of the LRU."

This reverts commit ab5bbea.

dist/ember-resource.js

@@ -259,11 +259,6 @@ if (typeof this === 'object') this.LRUCache = LRUCache;
 }());(function() {
   Ember.Resource.IdentityMap = function(limit) {
     this.cache = new LRUCache(limit || Ember.Resource.IdentityMap.DEFAULT_IDENTITY_MAP_LIMIT);
-    this.cache.shift = function() {
-      var obj = LRUCache.prototype.shift.call(this);
-      obj && obj.value && Em.Object.prototype.destroy.call(obj.value);
-      return obj;
-    };
   };
 
   Ember.Resource.IdentityMap.prototype = {
@@ -926,6 +921,8 @@ if (typeof this === 'object') this.LRUCache = LRUCache;
         var self = this;
 
         var updateExpiry = function() {
+          if(Ember.get(self, 'expireIn') === null) { return; }
+
           var expireAt = new Date();
           expireAt.setSeconds(expireAt.getSeconds() + Ember.get(self, 'expireIn'));
           Ember.set(self, 'expireAt', expireAt);

spec/javascripts/identityMapSpec.js

@@ -24,23 +24,6 @@ describe('identity map', function() {
     expect(Address.identityMap.size()).toBe(10);
   });
 
-  it('should call destroy on objects flushed from the identity map', function() {
-    var address, address1;
-
-    address1 = Address.create({id: 1});
-
-    for(var i=2; i<=10; i++) {
-      address = Address.create({id: i});
-    }
-
-    expect(address1.get('isDestroyed')).toBeFalsy();
-
-    Address.create({id: 11});
-
-    expect(address1.get('isDestroyed')).toBeTruthy();
-
-  });
-
   describe("for resource collections", function() {
     var Addresses = Em.ResourceCollection.extend();
 
@@ -70,23 +53,6 @@ describe('identity map', function() {
       expect(Address.identityMap.size()).toBe(10);
     });
 
-    it('should call destroy on objects flushed from the identity map', function() {
-      var address, address1;
-
-      address1 = Addresses.create({type: Address, url: '/address/1'});
-
-      for(var i=2; i<=10; i++) {
-        address = Addresses.create({type: Address, url: '/address/' + i});
-      }
-
-      expect(address1.get('isDestroyed')).toBeFalsy();
-
-      Addresses.create({type: Address, url: '/address/11'});
-
-      expect(address1.get('isDestroyed')).toBeTruthy();
-
-    });
-
 
   });
 });

src/identity_map.js

@@ -1,11 +1,6 @@
 (function() {
   Ember.Resource.IdentityMap = function(limit) {
     this.cache = new LRUCache(limit || Ember.Resource.IdentityMap.DEFAULT_IDENTITY_MAP_LIMIT);
-    this.cache.shift = function() {
-      var obj = LRUCache.prototype.shift.call(this);
-      obj && obj.value && Em.Object.prototype.destroy.call(obj.value);
-      return obj;
-    };
   };
 
   Ember.Resource.IdentityMap.prototype = {