loaded? will not raise an AR::RecordNotFound exception, so move the rescue inside the conditional

This commit is contained in:
Aaron Patterson
2011-01-14 15:58:59 -08:00
parent c326969745
commit a0a69b045a

View File

@@ -350,8 +350,8 @@ module ActiveRecord
def load_target
if !@owner.new_record? || foreign_key_present?
begin
unless loaded?
unless loaded?
begin
if @target.is_a?(Array) && @target.any?
@target = find_target.map do |f|
i = @target.index(f)
@@ -371,9 +371,9 @@ module ActiveRecord
else
@target = find_target
end
rescue ActiveRecord::RecordNotFound
reset
end
rescue ActiveRecord::RecordNotFound
reset
end
end