return early in case the left or right side lists are empty

This commit is contained in:
Aaron Patterson
2011-01-14 17:03:15 -08:00
parent 75e29e871e
commit b8ed2d5ddf

View File

@@ -359,11 +359,7 @@ module ActiveRecord
reset
end
if @target.any?
@target = merge_target_lists(targets, @target)
else
@target = targets
end
@target = merge_target_lists(targets, @target)
end
end
@@ -441,6 +437,9 @@ module ActiveRecord
private
def merge_target_lists(loaded, existing)
return loaded if existing.empty?
return existing if loaded.empty?
loaded.map do |f|
i = existing.index(f)
if i