diff options
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 12b0601e3c..fd9f000147 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -118,10 +118,10 @@ module ActiveRecord def clear_association_cache #:nodoc: self.class.reflect_on_all_associations.to_a.each do |assoc| if IdentityMap.enabled? && instance_variable_defined?("@#{assoc.name}") - targets = [*instance_variable_get("@#{assoc.name}")] - targets.map! { |t| t.respond_to?(:target) ? t.target : t } - targets.compact! - targets.each { |r| IdentityMap.remove r } + Array(instance_variable_get("@#{assoc.name}")).each do |t| + next unless t.respond_to?(:target) + IdentityMap.remove t.target unless t.target.nil? + end end instance_variable_set "@#{assoc.name}", nil end if self.persisted? |