diff --git a/lib/delegate.rb b/lib/delegate.rb index e709b72209..9ed1409ba0 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -179,17 +179,21 @@ class Delegator # Serialization support for the object returned by \_\_getobj\_\_. def marshal_dump [ + :__v2__, instance_variables, instance_variables.map{|var| instance_variable_get(var)}, __getobj__ ] end # Reinitializes delegation from a serialized object. - def marshal_load(obj) - vars, values, obj = obj - vars.each_with_index{|var, i| instance_variable_set(var, values[i])} - initialize_methods(obj) - __setobj__(obj) + def marshal_load(data) + version, vars, values, obj = data + if version == :__v2__ + vars.each_with_index{|var, i| instance_variable_set(var, values[i])} + __setobj__(obj) + else + __setobj__(data) + end end end