From 51977bc261f83091a31c7f3d6f8dbd59cec1d2a3 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Tue, 4 Sep 2007 17:32:48 +0000 Subject: Fix bug where unserializing an attribute attempts to modify a frozen @attributes hash for a deleted record. [Rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7406 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/attribute_methods.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/attribute_methods.rb') diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index d2346c896e..657abc8b8d 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -207,7 +207,7 @@ module ActiveRecord unserialized_object = object_from_yaml(@attributes[attr_name]) if unserialized_object.is_a?(self.class.serialized_attributes[attr_name]) || unserialized_object.nil? - @attributes[attr_name] = unserialized_object + @attributes.frozen? ? unserialized_object : @attributes[attr_name] = unserialized_object else raise SerializationTypeMismatch, "#{attr_name} was supposed to be a #{self.class.serialized_attributes[attr_name]}, but was a #{unserialized_object.class.to_s}" -- cgit v1.2.3