Permalink
Browse files

Merge pull request #4141 from arunagw/fix_build

Fix build 3-2-stable
  • Loading branch information...
josevalim committed Dec 23, 2011
2 parents 5f2bfce + 96c38ec commit 35ded6fd088074acb239d0976e9e19c69512b246
Showing with 3 additions and 4 deletions.
  1. +3 −4 activerecord/lib/active_record/identity_map.rb
@@ -111,13 +111,12 @@ def clear
# model object.
def reinit_with(coder)
@attributes_cache = {}
- dirty = @changed_attributes.keys
- @attributes.update(coder['attributes'].except(*dirty))
+ dirty = @changed_attributes.keys
+ attributes = self.class.initialize_attributes(coder['attributes'].except(*dirty))
+ @attributes.update(attributes)
@changed_attributes.update(coder['attributes'].slice(*dirty))
@changed_attributes.delete_if{|k,v| v.eql? @attributes[k]}
- set_serialized_attributes
-
run_callbacks :find
self

0 comments on commit 35ded6f

Please sign in to comment.