diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-13 16:19:41 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-13 16:19:41 -0700 |
| commit | 795062282e072f289918688e978a0cf24e6d3aa5 (patch) | |
| tree | 44c20ee7ce7b438052c6c6f48603c560954858ef /activerecord/lib/active_record/attribute_methods | |
| parent | c1f397f82c7b3f352500832a399b5dbdc500b9c8 (diff) | |
| parent | dde3058c3a7350d6e28d602a1f57fe908075bbe7 (diff) | |
| download | rails-795062282e072f289918688e978a0cf24e6d3aa5.tar.gz rails-795062282e072f289918688e978a0cf24e6d3aa5.tar.bz2 rails-795062282e072f289918688e978a0cf24e6d3aa5.zip | |
Merge pull request #5261 from carlosantoniodasilva/identity-map-removal
Remove IdentityMap
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/dirty.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb index 3a737e5b35..11c63591e3 100644 --- a/activerecord/lib/active_record/attribute_methods/dirty.rb +++ b/activerecord/lib/active_record/attribute_methods/dirty.rb @@ -22,8 +22,6 @@ module ActiveRecord if status = super @previously_changed = changes @changed_attributes.clear - elsif IdentityMap.enabled? - IdentityMap.remove(self) end status end @@ -34,9 +32,6 @@ module ActiveRecord @previously_changed = changes @changed_attributes.clear end - rescue - IdentityMap.remove(self) if IdentityMap.enabled? - raise end # <tt>reload</tt> the record and clears changed attributes. |